@workday/canvas-kit-react 11.2.15 → 11.2.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/common/lib/utils/mergeProps.ts +3 -0
  2. package/dist/commonjs/common/lib/utils/mergeProps.d.ts.map +1 -1
  3. package/dist/commonjs/common/lib/utils/mergeProps.js +4 -0
  4. package/dist/es6/common/lib/utils/mergeProps.d.ts.map +1 -1
  5. package/dist/es6/common/lib/utils/mergeProps.js +4 -0
  6. package/package.json +4 -4
package/common/lib/utils/mergeProps.ts CHANGED
@@ -50,6 +50,9 @@ export function mergeProps<T extends object, S extends object>(
50
50
  // @ts-ignore Typescript complains that key might not exist in `targetProps` since we're iterating over sourceProps. At runtime this doesn't matter
51
51
  } else if (targetProps[key] === null) {
52
52
  // target props is trying to disable the prop for whatever reason. Consider `null` a "remove this prop"
53
+ } else if (key === 'className' && targetProps.hasOwnProperty(key)) {
54
+ // @ts-ignore merging class names
55
+ returnProps[key] = `${targetProps[key]} ${sourceProps[key]}`;
53
56
  } else {
54
57
  // @ts-ignore TS has more object constraint complaints that aren't useful here
55
58
  returnProps[key] = sourceProps[key];
package/dist/commonjs/common/lib/utils/mergeProps.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mergeProps.d.ts","sourceRoot":"","sources":["../../../../../common/lib/utils/mergeProps.ts"],"names":[],"mappings":"AAMA;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAC3D,WAAW,EAAE,CAAC,EACd,WAAW,EAAE,CAAC,GACb,CAAC,GAAG,CAAC,CA2CP"}
1
+ {"version":3,"file":"mergeProps.d.ts","sourceRoot":"","sources":["../../../../../common/lib/utils/mergeProps.ts"],"names":[],"mappings":"AAMA;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAC3D,WAAW,EAAE,CAAC,EACd,WAAW,EAAE,CAAC,GACb,CAAC,GAAG,CAAC,CA8CP"}
package/dist/commonjs/common/lib/utils/mergeProps.js CHANGED
@@ -49,6 +49,10 @@ function mergeProps(targetProps, sourceProps) {
49
49
  else if (targetProps[key] === null) {
50
50
  // target props is trying to disable the prop for whatever reason. Consider `null` a "remove this prop"
51
51
  }
52
+ else if (key === 'className' && targetProps.hasOwnProperty(key)) {
53
+ // @ts-ignore merging class names
54
+ returnProps[key] = `${targetProps[key]} ${sourceProps[key]}`;
55
+ }
52
56
  else {
53
57
  // @ts-ignore TS has more object constraint complaints that aren't useful here
54
58
  returnProps[key] = sourceProps[key];
package/dist/es6/common/lib/utils/mergeProps.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"mergeProps.d.ts","sourceRoot":"","sources":["../../../../../common/lib/utils/mergeProps.ts"],"names":[],"mappings":"AAMA;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAC3D,WAAW,EAAE,CAAC,EACd,WAAW,EAAE,CAAC,GACb,CAAC,GAAG,CAAC,CA2CP"}
1
+ {"version":3,"file":"mergeProps.d.ts","sourceRoot":"","sources":["../../../../../common/lib/utils/mergeProps.ts"],"names":[],"mappings":"AAMA;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAC3D,WAAW,EAAE,CAAC,EACd,WAAW,EAAE,CAAC,GACb,CAAC,GAAG,CAAC,CA8CP"}
package/dist/es6/common/lib/utils/mergeProps.js CHANGED
@@ -46,6 +46,10 @@ export function mergeProps(targetProps, sourceProps) {
46
46
  else if (targetProps[key] === null) {
47
47
  // target props is trying to disable the prop for whatever reason. Consider `null` a "remove this prop"
48
48
  }
49
+ else if (key === 'className' && targetProps.hasOwnProperty(key)) {
50
+ // @ts-ignore merging class names
51
+ returnProps[key] = `${targetProps[key]} ${sourceProps[key]}`;
52
+ }
49
53
  else {
50
54
  // @ts-ignore TS has more object constraint complaints that aren't useful here
51
55
  returnProps[key] = sourceProps[key];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@workday/canvas-kit-react",
3
- "version": "11.2.15",
3
+ "version": "11.2.16",
4
4
  "description": "The parent module that contains all Workday Canvas Kit React components",
5
5
  "author": "Workday, Inc. (https://www.workday.com)",
6
6
  "license": "Apache-2.0",
@@ -49,8 +49,8 @@
49
49
  "@emotion/styled": "^11.6.0",
50
50
  "@popperjs/core": "^2.5.4",
51
51
  "@workday/canvas-colors-web": "^2.0.0",
52
- "@workday/canvas-kit-popup-stack": "^11.2.15",
53
- "@workday/canvas-kit-styling": "^11.2.15",
52
+ "@workday/canvas-kit-popup-stack": "^11.2.16",
53
+ "@workday/canvas-kit-styling": "^11.2.16",
54
54
  "@workday/canvas-system-icons-web": "^3.0.0",
55
55
  "@workday/canvas-tokens-web": "^2.0.0",
56
56
  "@workday/design-assets-types": "^0.2.8",
@@ -67,5 +67,5 @@
67
67
  "@workday/canvas-accent-icons-web": "^3.0.0",
68
68
  "@workday/canvas-applet-icons-web": "^2.0.0"
69
69
  },
70
- "gitHead": "7070b588614891bf36ecfaf7dcedf872cc776afb"
70
+ "gitHead": "dbdda2e826e303179385fee74342e5a0d36e9846"
71
71
  }