Skip to content

Commit

Permalink
Fixed column class handling
Browse files Browse the repository at this point in the history
  • Loading branch information
iancharlesdouglas committed Apr 19, 2024
1 parent 9405dcc commit 8fc4850
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
(The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).)

## [0.0.15](https://github.com/iancharlesdouglas/carbon-icons-qwik/releases/tag/0.0.15) - 2024-04-19
## [0.0.16](https://github.com/iancharlesdouglas/carbon-icons-qwik/releases/tag/0.0.16) - 2024-04-19
|Added|Fixed|Changed|Removed|
|-|-|-|-|
|Heading component added|-|-|-|
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "carbon-components-qwik",
"version": "0.0.15",
"version": "0.0.16",
"description": "Carbon Design System components implemented as Qwik components",
"license": "Apache-2.0",
"main": "./lib/index.qwik.mjs",
Expand Down
4 changes: 3 additions & 1 deletion src/components/grid/column.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { QwikIntrinsicElements, Slot, component$ } from '@builder.io/qwik';
import { usePrefix } from '../../internal/hooks/use-prefix';
import classNames from 'classnames';
import { removeProps } from '../../internal/objects/remove-props';

/**
* Column span
Expand Down Expand Up @@ -45,7 +46,8 @@ export const Column = component$((props: ColumnProps) => {
const breakpointClass = getClassesForBreakpoints(props, prefix);
const spanClass = getClassesForSpan(span, prefix);
const classes = classNames(customClass, breakpointClass, spanClass, `${prefix}--css-grid-column`);
const sanitizedProps = props; // _.omit(props, 'class', 'sm', 'md', 'lg', 'xlg', 'max', 'span');
console.log('classes', classes);
const sanitizedProps = removeProps(props, 'class', 'sm', 'md', 'lg', 'xlg', 'max', 'span');
return (
<div class={classes} {...sanitizedProps}>
<Slot />
Expand Down
2 changes: 1 addition & 1 deletion src/test/test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ const Test = component$(() => {
<Grid class="test-class" id="main-grid" fullWidth>
<Column sm={4} md={8} lg={16}>
<Grid class="subgrid-class" id="sub-grid" fullWidth>
<Column sm={1} md={2} lg={4}>
<Column sm={1} md={2} lg={4} class="test">
<Checkbox labelText="Active" checked={false} onChange$={$(() => console.log('changed'))} />
<Button
onClick$={$(() => {
Expand Down

0 comments on commit 8fc4850

Please sign in to comment.