diff --git a/modules/preview-react/form-field/lib/FormFieldHint.tsx b/modules/preview-react/form-field/lib/FormFieldHint.tsx index e753891365..8df2dd84f2 100644 --- a/modules/preview-react/form-field/lib/FormFieldHint.tsx +++ b/modules/preview-react/form-field/lib/FormFieldHint.tsx @@ -13,7 +13,6 @@ export const formFieldHintStencil = createStencil({ extends: textStencil, base: { margin: `${system.space.x2} ${system.space.zero} ${system.space.zero}`, - [parentModifier(formFieldStencil.modifiers.error.error)]: { color: brand.error.base, }, diff --git a/modules/preview-react/form-field/lib/FormFieldInput.tsx b/modules/preview-react/form-field/lib/FormFieldInput.tsx index 69de3dcf7c..bdd196135e 100644 --- a/modules/preview-react/form-field/lib/FormFieldInput.tsx +++ b/modules/preview-react/form-field/lib/FormFieldInput.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {createSubcomponent, ExtractProps} from '@workday/canvas-kit-react/common'; -import {Box} from '@workday/canvas-kit-react/layout'; +import {Box, mergeStyles} from '@workday/canvas-kit-react/layout'; import {useFormFieldInput, useFormFieldModel} from './hooks'; @@ -10,5 +10,5 @@ export const FormFieldInput = createSubcomponent('input')({ modelHook: useFormFieldModel, elemPropsHook: useFormFieldInput, })>((elemProps, Element) => { - return ; + return ; }); diff --git a/modules/preview-react/form-field/lib/formFieldStencil.ts b/modules/preview-react/form-field/lib/formFieldStencil.ts index 8f63363889..3c6e9979d4 100644 --- a/modules/preview-react/form-field/lib/formFieldStencil.ts +++ b/modules/preview-react/form-field/lib/formFieldStencil.ts @@ -15,6 +15,9 @@ export const formFieldStencil = createStencil({ '[data-width="ck-formfield-width"]': { width: '100%', }, + '&:has(div[data-width="ck-formfield-width"])': { + width: '100%', + }, }, }, orientation: { diff --git a/modules/react/checkbox/stories/examples/Inverse.tsx b/modules/react/checkbox/stories/examples/Inverse.tsx index 2cade52faa..bcb69c19b2 100644 --- a/modules/react/checkbox/stories/examples/Inverse.tsx +++ b/modules/react/checkbox/stories/examples/Inverse.tsx @@ -3,10 +3,8 @@ import {Checkbox} from '@workday/canvas-kit-react/checkbox'; import {Flex} from '@workday/canvas-kit-react/layout'; import {createStyles} from '@workday/canvas-kit-styling'; import {system} from '@workday/canvas-tokens-web'; -import {FormField} from '@workday/canvas-kit-preview-react/form-field'; const styleOverrides = createStyles({ - gap: system.space.x4, backgroundColor: system.color.bg.primary.default, padding: system.space.x4, }); @@ -20,18 +18,12 @@ export const Inverse = () => { return ( - - Confirm - - - - + ); }; diff --git a/modules/react/text-area/stories/examples/Grow.tsx b/modules/react/text-area/stories/examples/Grow.tsx index 7a8ceba7f6..4cac7d2100 100644 --- a/modules/react/text-area/stories/examples/Grow.tsx +++ b/modules/react/text-area/stories/examples/Grow.tsx @@ -11,9 +11,9 @@ export const Grow = () => { return ( - Leave a Review + Leave a Review foo - + ); diff --git a/modules/react/text-input/stories/examples/Grow.tsx b/modules/react/text-input/stories/examples/Grow.tsx index 488ec8d5ef..1626f05ff5 100644 --- a/modules/react/text-input/stories/examples/Grow.tsx +++ b/modules/react/text-input/stories/examples/Grow.tsx @@ -10,10 +10,10 @@ export const Grow = () => { }; return ( - + Street Address - + );