fix: fix #form-row hash sum on caching context

dnbexperience · Jan 21, 2020 · 2cfb274 · 2cfb274
1 parent 1db3386
commit 2cfb274
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/packages/dnb-ui-lib/src/components/form-row/FormRow.js b/packages/dnb-ui-lib/src/components/form-row/FormRow.js
@@ -218,8 +218,9 @@ export default class FormRow extends PureComponent {
     validateDOMAttributes(this.props, params)
 
     // check if context has changed, if yes, then update the cache
-    if (hashSum(this._cachedContext) !== hashSum(this.context)) {
-      this._cachedContext = this.context
+    const cacheSum = { ...this.context, ...this.props }
+    if (hashSum(this._cachedContext) !== hashSum(cacheSum)) {
+      this._cachedContext = cacheSum
 
       const formRow = {
         useId: () => {

diff --git a/packages/dnb-ui-lib/src/components/form-row/__tests__/FormRow.test.js b/packages/dnb-ui-lib/src/components/form-row/__tests__/FormRow.test.js
@@ -86,6 +86,16 @@ describe('FormRow component', () => {
     expect(Comp.find('legend').exists()).toBe(false)
   })
 
+  it('should react correct on two states in row', () => {
+    const Comp = mount(
+      <Component {...props} disabled={false}>
+        <Input />
+      </Component>
+    )
+    Comp.setProps({ disabled: true })
+    expect(Comp.find('input').is('[disabled]')).toBe(true)
+  })
+
   it('should validate with ARIA rules', async () => {
     expect(await axeComponent(Comp)).toHaveNoViolations()
   })

diff --git a/packages/dnb-ui-lib/src/components/textarea/Textarea.js b/packages/dnb-ui-lib/src/components/textarea/Textarea.js
@@ -220,7 +220,7 @@ export default class Textarea extends PureComponent {
       this.props,
       defaultProps,
       this.context.formRow,
-      this.context.translation.DatePicker
+      this.context.translation.Textarea
     )
 
     const {

diff --git a/packages/dnb-ui-lib/src/components/toggle-button/ToggleButton.js b/packages/dnb-ui-lib/src/components/toggle-button/ToggleButton.js
@@ -272,7 +272,8 @@ export default class ToggleButton extends Component {
             this.props,
             defaultProps,
             this.context, // internal context
-            context.formRow
+            context.formRow,
+            context.translation.ToggleButton
           )
 
           const {

diff --git a/packages/dnb-ui-lib/src/components/toggle-button/ToggleButtonGroup.js b/packages/dnb-ui-lib/src/components/toggle-button/ToggleButtonGroup.js
@@ -191,7 +191,7 @@ export default class ToggleButtonGroup extends PureComponent {
       this.props,
       defaultProps,
       this.context.formRow,
-      this.context.translation.DatePicker
+      this.context.translation.ToggleButton
     )
 
     const {