@workday/canvas-kit-react 11.0.1 → 11.0.3

package/dist/commonjs/layout/lib/utils/mergeStyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mergeStyles.d.ts","sourceRoot":"","sources":["../../../../../layout/lib/utils/mergeStyles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAe,MAAM,6BAA6B,CAAC;AAczE,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AA2B9C;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,EAAE;AACtC;;;GAGG;AACH,QAAQ,EAAE,CAAC;AACX;;;GAGG;AACH,OAAO,CAAC,EAAE,cAAc,GACvB,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,gBAAgB,CAAC,CA4BxC"}
+{"version":3,"file":"mergeStyles.d.ts","sourceRoot":"","sources":["../../../../../layout/lib/utils/mergeStyles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAe,MAAM,6BAA6B,CAAC;AAczE,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AA4B9C;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,EAAE;AACtC;;;GAGG;AACH,QAAQ,EAAE,CAAC;AACX;;;GAGG;AACH,OAAO,CAAC,EAAE,cAAc,GACvB,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,gBAAgB,CAAC,CA4BxC"}

package/dist/commonjs/layout/lib/utils/mergeStyles.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeStyles = void 0;
 const canvas_kit_styling_1 = require("@workday/canvas-kit-styling");
 const Box_1 = require("../Box");
-const flex_1 = require("../utils/flex");
 const background_1 = require("./background");
 const border_1 = require("./border");
 const color_1 = require("./color");
 const depth_1 = require("./depth");
-const flex_2 = require("./flex");
+const flex_1 = require("./flex");
 const flexItem_1 = require("./flexItem");
+const grid_1 = require("./grid");
 const gridItem_1 = require("./gridItem");
 const layout_1 = require("./layout");
 const other_1 = require("./other");
@@ -22,8 +22,9 @@ const stylePropHash = [
     ...border_1.borderStyleFnConfigs,
     ...color_1.colorStyleFnConfigs,
     ...depth_1.depthStyleFnConfigs,
-    ...flex_2.flexStyleFnConfigs,
+    ...flex_1.flexStyleFnConfigs,
     ...flexItem_1.flexItemStyleFnConfigs,
+    ...grid_1.gridStyleFnConfigs,
     ...gridItem_1.gridItemStyleFnConfigs,
     ...layout_1.layoutStyleFnConfigs,
     ...other_1.otherStyleFnConfigs,
@@ -70,10 +71,10 @@ localCs) {
         return result;
     }, {});
     let styles = {};
-    // We have style props. We need to create style and merge with our `csToProps` to get the correct
-    // merging order for styles
+    // We have style props currently and we will need to create style and merge with our `csToProps` to get the correct
+    // merging order for styles. This includes box, flex and grid styles.
     if (shouldRuntimeMergeStyles) {
-        styles = { ...Box_1.boxStyleFn(styleProps), ...flex_1.flex(styleProps) };
+        styles = { ...Box_1.boxStyleFn(styleProps), ...flex_1.flex(styleProps), ...grid_1.grid(styleProps) };
     }
     return canvas_kit_styling_1.handleCsProp(elemProps, [localCs, styles]);
 }

package/dist/es6/layout/lib/utils/mergeStyles.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mergeStyles.d.ts","sourceRoot":"","sources":["../../../../../layout/lib/utils/mergeStyles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAe,MAAM,6BAA6B,CAAC;AAczE,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AA2B9C;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,EAAE;AACtC;;;GAGG;AACH,QAAQ,EAAE,CAAC;AACX;;;GAGG;AACH,OAAO,CAAC,EAAE,cAAc,GACvB,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,gBAAgB,CAAC,CA4BxC"}
+{"version":3,"file":"mergeStyles.d.ts","sourceRoot":"","sources":["../../../../../layout/lib/utils/mergeStyles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAe,MAAM,6BAA6B,CAAC;AAczE,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AA4B9C;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,EAAE;AACtC;;;GAGG;AACH,QAAQ,EAAE,CAAC;AACX;;;GAGG;AACH,OAAO,CAAC,EAAE,cAAc,GACvB,IAAI,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,gBAAgB,CAAC,CA4BxC"}

package/dist/es6/layout/lib/utils/mergeStyles.js

@@ -1,12 +1,12 @@
 import { handleCsProp } from '@workday/canvas-kit-styling';
 import { boxStyleFn } from '../Box';
-import { flex } from '../utils/flex';
 import { backgroundStyleFnConfigs } from './background';
 import { borderStyleFnConfigs } from './border';
 import { colorStyleFnConfigs } from './color';
 import { depthStyleFnConfigs } from './depth';
-import { flexStyleFnConfigs } from './flex';
+import { flex, flexStyleFnConfigs } from './flex';
 import { flexItemStyleFnConfigs } from './flexItem';
+import { grid, gridStyleFnConfigs } from './grid';
 import { gridItemStyleFnConfigs } from './gridItem';
 import { layoutStyleFnConfigs } from './layout';
 import { otherStyleFnConfigs } from './other';
@@ -21,6 +21,7 @@ const stylePropHash = [
     ...depthStyleFnConfigs,
     ...flexStyleFnConfigs,
     ...flexItemStyleFnConfigs,
+    ...gridStyleFnConfigs,
     ...gridItemStyleFnConfigs,
     ...layoutStyleFnConfigs,
     ...otherStyleFnConfigs,
@@ -67,10 +68,10 @@ localCs) {
         return result;
     }, {});
     let styles = {};
-    // We have style props. We need to create style and merge with our `csToProps` to get the correct
-    // merging order for styles
+    // We have style props currently and we will need to create style and merge with our `csToProps` to get the correct
+    // merging order for styles. This includes box, flex and grid styles.
     if (shouldRuntimeMergeStyles) {
-        styles = { ...boxStyleFn(styleProps), ...flex(styleProps) };
+        styles = { ...boxStyleFn(styleProps), ...flex(styleProps), ...grid(styleProps) };
     }
     return handleCsProp(elemProps, [localCs, styles]);
 }

package/layout/lib/utils/mergeStyles.ts

@@ -1,12 +1,12 @@
 import {CSToPropsInput, handleCsProp} from '@workday/canvas-kit-styling';
 import {boxStyleFn} from '../Box';
-import {flex} from '../utils/flex';
 import {backgroundStyleFnConfigs} from './background';
 import {borderStyleFnConfigs} from './border';
 import {colorStyleFnConfigs} from './color';
 import {depthStyleFnConfigs} from './depth';
-import {flexStyleFnConfigs} from './flex';
+import {flex, flexStyleFnConfigs} from './flex';
 import {flexItemStyleFnConfigs} from './flexItem';
+import {grid, gridStyleFnConfigs} from './grid';
 import {gridItemStyleFnConfigs} from './gridItem';
 import {layoutStyleFnConfigs} from './layout';
 import {otherStyleFnConfigs} from './other';
@@ -23,6 +23,7 @@ const stylePropHash = [
   ...depthStyleFnConfigs,
   ...flexStyleFnConfigs,
   ...flexItemStyleFnConfigs,
+  ...gridStyleFnConfigs,
   ...gridItemStyleFnConfigs,
   ...layoutStyleFnConfigs,
   ...otherStyleFnConfigs,
@@ -75,10 +76,10 @@ export function mergeStyles<T extends {}>(
 
   let styles = {};
 
-  // We have style props. We need to create style and merge with our `csToProps` to get the correct
-  // merging order for styles
+  // We have style props currently and we will need to create style and merge with our `csToProps` to get the correct
+  // merging order for styles. This includes box, flex and grid styles.
   if (shouldRuntimeMergeStyles) {
-    styles = {...boxStyleFn(styleProps), ...flex(styleProps)};
+    styles = {...boxStyleFn(styleProps), ...flex(styleProps), ...grid(styleProps)};
   }
 
   return handleCsProp(elemProps, [localCs, styles]) as Omit<T, 'cs' | keyof CommonStyleProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workday/canvas-kit-react",
-  "version": "11.0.1",
+  "version": "11.0.3",
   "description": "The parent module that contains all Workday Canvas Kit React components",
   "author": "Workday, Inc. (https://www.workday.com)",
   "license": "Apache-2.0",
@@ -49,8 +49,8 @@
     "@emotion/styled": "^11.6.0",
     "@popperjs/core": "^2.5.4",
     "@workday/canvas-colors-web": "^2.0.0",
-    "@workday/canvas-kit-popup-stack": "^11.0.1",
-    "@workday/canvas-kit-styling": "^11.0.1",
+    "@workday/canvas-kit-popup-stack": "^11.0.3",
+    "@workday/canvas-kit-styling": "^11.0.3",
     "@workday/canvas-system-icons-web": "^3.0.0",
     "@workday/canvas-tokens-web": "^1.3.1",
     "@workday/design-assets-types": "^0.2.8",
@@ -67,5 +67,5 @@
     "@workday/canvas-accent-icons-web": "^3.0.0",
     "@workday/canvas-applet-icons-web": "^2.0.0"
   },
-  "gitHead": "17945e6fcc65d3b9f937407558b8df394acacdbc"
+  "gitHead": "5ba63c8853ade41d8dadf9d7e98203acb15a3fc3"
 }