Merge pull request #16366 from pahan35/fix/lost-control-false

Addon-controls: Fix `{control: false}` handling
storybookjs · Oct 16, 2021 · 6717fce · 6717fce
2 parents 43bc8cc + 1fc38e6
commit 6717fce
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/lib/store/src/normalizeInputTypes.test.ts b/lib/store/src/normalizeInputTypes.test.ts
@@ -41,6 +41,26 @@ describe('normalizeInputType', () => {
       defaultValue: 'defaultValue',
     });
   });
+
+  it('preserves disabled control via shortcut', () => {
+    expect(
+      normalizeInputType(
+        {
+          type: 'string',
+          control: false,
+          description: 'description',
+          defaultValue: 'defaultValue',
+        },
+        'arg'
+      )
+    ).toEqual({
+      name: 'arg',
+      type: { name: 'string' },
+      control: { disable: true },
+      description: 'description',
+      defaultValue: 'defaultValue',
+    });
+  });
 });
 
 describe('normalizeInputTypes', () => {

diff --git a/lib/store/src/normalizeInputTypes.ts b/lib/store/src/normalizeInputTypes.ts
@@ -22,7 +22,11 @@ export const normalizeInputType = (inputType: InputType, key: string): StrictInp
     ...rest,
   };
   if (type) normalized.type = normalizeType(type);
-  if (control) normalized.control = normalizeControl(control);
+  if (control) {
+    normalized.control = normalizeControl(control);
+  } else if (control === false) {
+    normalized.control = { disable: true };
+  }
   return normalized;
 };