Merge branch 'master' of github.com:DevoInc/genesys-ui

DevoInc · Oct 23, 2024 · d70ecf0 · d70ecf0
2 parents cad51ac + 82109b2
commit d70ecf0
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [13.3.0](https://github.com/DevoInc/genesys-ui/compare/v13.2.0...v13.3.0) (2024-10-23)
+
+
+### Features
+
+* integration of components with component tokens instead of alias ones ([55bb8fe](https://github.com/DevoInc/genesys-ui/commit/55bb8feaa111a4d2de3696d5060885956c235d09))
+
 ## [13.2.0](https://github.com/DevoInc/genesys-ui/compare/v13.1.0...v13.2.0) (2024-10-22)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "genesys-ui",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "description": "",
   "type": "module",
   "private": true,

diff --git a/packages/code/package.json b/packages/code/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devoinc/genesys-ui-code",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "description": "",
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -30,7 +30,7 @@
     "dpdm": "dpdm --exit-code circular:1 ./src/index.ts"
   },
   "peerDependencies": {
-    "@devoinc/genesys-ui": "^13.2.0",
+    "@devoinc/genesys-ui": "^13.3.0",
     "ahooks": "3.x.x",
     "monaco-editor-core": "0.x.x",
     "react": "16.x || 17.x || 18.x",

diff --git a/packages/color/package.json b/packages/color/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devoinc/genesys-ui-color",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "description": "",
   "type": "module",
   "scripts": {
@@ -29,7 +29,7 @@
   "author": "",
   "license": "MIT",
   "peerDependencies": {
-    "@devoinc/genesys-ui": "^13.2.0",
+    "@devoinc/genesys-ui": "^13.3.0",
     "polished": "4.x.x",
     "react": "16.x || 17.x || 18.x",
     "react-color": "2.x.x",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devoinc/genesys-ui",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "description": "",
   "type": "module",
   "types": "./dist/index.d.ts",

diff --git a/packages/datetime/package.json b/packages/datetime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devoinc/genesys-ui-datetime",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "description": "",
   "type": "module",
   "scripts": {
@@ -31,7 +31,7 @@
   "license": "MIT",
   "peerDependencies": {
     "@devoinc/genesys-icons": "4.x.x || 5.x.x || 6.x.x",
-    "@devoinc/genesys-ui": "^13.2.0",
+    "@devoinc/genesys-ui": "^13.3.0",
     "date-fns": "2.x.x",
     "react": "16.x || 17.x || 18.x",
     "react-popper": "2.x.x",

diff --git a/packages/table/package.json b/packages/table/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devoinc/genesys-ui-table",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "description": "Genesys composable table",
   "type": "module",
   "scripts": {
@@ -31,8 +31,8 @@
   "license": "MIT",
   "peerDependencies": {
     "@devoinc/genesys-icons": "^4.x.x || ^5.x.x || ^6.x.x",
-    "@devoinc/genesys-ui": "^13.2.0",
-    "@devoinc/genesys-ui-datetime": "^13.2.0",
+    "@devoinc/genesys-ui": "^13.3.0",
+    "@devoinc/genesys-ui-datetime": "^13.3.0",
     "@tanstack/react-virtual": "3.x.x",
     "date-fns": "2.x.x",
     "date-fns-tz": "2.x.x",

diff --git a/packages/table/src/core/HeaderCell/HeaderCell.tsx b/packages/table/src/core/HeaderCell/HeaderCell.tsx
@@ -13,6 +13,7 @@ interface HeaderCellProps {
   offsetX: number;
   children: React.ReactNode;
   title?: string;
+  filter?: boolean;
 }
 
 export const HeaderCell: React.FC<HeaderCellProps> = ({
@@ -21,8 +22,9 @@ export const HeaderCell: React.FC<HeaderCellProps> = ({
   offsetX,
   children,
   title,
+  filter
 }) => {
-  const { density, onSort, resizableColumns, showFilters } = React.useContext(TableContext);
+  const { density, onSort, resizableColumns } = React.useContext(TableContext);
 
   return (
     <StyledHeaderCell
@@ -42,7 +44,7 @@ export const HeaderCell: React.FC<HeaderCellProps> = ({
       }
     >
       {children}
-      {colDef.sortable && !showFilters && <OrderIndicator colDef={colDef} />}
+      {colDef.sortable && !filter && <OrderIndicator colDef={colDef} />}
       {(colDef?.resizable ?? resizableColumns) && (
         <StyledHeaderCellResizer
           $density={density}

diff --git a/packages/table/src/core/TableHead/TableHead.tsx b/packages/table/src/core/TableHead/TableHead.tsx
@@ -63,6 +63,7 @@ export const TableHead: React.FC<TableHeadProps> = ({
                   colDef={colDef}
                   width={virtualColumn ? `${virtualColumn.size}px` : 'auto'}
                   offsetX={virtualColumn ? virtualColumn.start : undefined}
+                  filter={true}
                 >
                   {colDef?.headerOnFilterPosition ? (
                     colDef?.headerRenderer ? (

diff --git a/packages/table/stories/column/Order.stories.tsx b/packages/table/stories/column/Order.stories.tsx
@@ -76,6 +76,7 @@ const OrderTable = () => {
         editable: false,
         sortable: true,
       }}
+      showFilters
       colDefs={updateColDefsWithOrderStruct(colDefs, orderStruct)}
       data={dataOrdered}
     />

diff --git a/packages/upload/package.json b/packages/upload/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@devoinc/genesys-ui-upload",
-  "version": "13.2.0",
+  "version": "13.3.0",
   "description": "",
   "type": "module",
   "scripts": {
@@ -30,7 +30,7 @@
   "license": "MIT",
   "peerDependencies": {
     "@devoinc/genesys-icons": "4.x.x || 5.x.x || 6.x.x",
-    "@devoinc/genesys-ui": "^13.2.0",
+    "@devoinc/genesys-ui": "^13.3.0",
     "filepond-plugin-file-validate-size": "2.x.x",
     "filepond-plugin-file-validate-type": "1.x.x",
     "filepond-plugin-image-preview": "4.x.x",