1 files changed, 41 insertions, 31 deletions

diff --git a/uidev/src/stories/button.stories.tsx b/uidev/src/stories/button.stories.tsx
index 5c1c9246d..5ca657238 100644
--- a/uidev/src/stories/button.stories.tsx
+++ b/uidev/src/stories/button.stories.tsx
@@ -27,20 +27,18 @@ const styles = {
   },
 };
 
-const createStore = (args?: any) => {
-  return observable(Object.assign({}, defaultProps, args));
-};
+const createStore = (args?: any) => observable({ ...defaultProps, ...args });
 
 const WithStoreButton = observer(({ store }: { store: any }) => (
   <>
     <Button
-      {...Object.assign({}, defaultProps, store)}
+      {...({ ...defaultProps, ...store })}
       onClick={!store.onClick ? () => {
         store.busy = !store.busy;
 
         window.setTimeout(() => {
           store.busy = !store.busy;
-        },                1000);
+        }, 1000);
       } : store.onClick}
     />
   </>
@@ -53,58 +51,69 @@ storiesOf('Button')
   .add('Secondary', () => (
     <WithStoreButton store={createStore({
       buttonType: 'secondary',
-    })} />
+    })}
+    />
   ))
   .add('Success', () => (
     <WithStoreButton store={createStore({
       buttonType: 'success',
-    })} />
+    })}
+    />
   ))
   .add('Warning', () => (
     <WithStoreButton store={createStore({
       buttonType: 'warning',
-    })} />
+    })}
+    />
   ))
   .add('Danger', () => (
     <WithStoreButton store={createStore({
       buttonType: 'danger',
-    })} />
+    })}
+    />
   ))
   .add('Inverted', () => (
     <WithStoreButton store={createStore({
       buttonType: 'inverted',
-    })} />
+    })}
+    />
   ))
   .add('Full width', () => (
     <WithStoreButton store={createStore({
       stretch: true,
-    })} />
+    })}
+    />
   ))
   .add('Disabled', () => (
     <WithStoreButton store={createStore({
       disabled: true,
-    })} />
+    })}
+    />
   ))
   .add('With loader', () => (
     <WithStoreButton store={createStore({
       busy: true,
-    })} />
+    })}
+    />
   ))
   .add('With icon', () => (
     <WithStoreButton store={createStore({
       icon: mdiInformation,
-    })} />
+    })}
+    />
   ))
   .add('As link', () => (
     <WithStoreButton store={createStore({
       href: 'https://meetfranz.com',
-    })} />
+    })}
+    />
   ))
   .add('As link (target=_blank)', () => (
     <WithStoreButton store={createStore({
       href: 'https://meetfranz.com',
       target: '_blank',
-    })} />
+    })}
+    />
   ))
   .add('As link (with onClick)', () => (
     <WithStoreButton store={createStore({
@@ -113,26 +122,27 @@ storiesOf('Button')
         e.preventDefault();
         alert('Click event');
       },
-    })}/>
+    })}
+    />
   ))
   .add('Long multi-line button', () => (
     <WithStoreButton store={createStore({
       label: 'But there is something that I must say to my people, who stand on the warm threshold which leads into the palace of justice: In the process of gaining our rightful place, we must not be guilty of wrongful deeds. Let us not seek to satisfy our thirst for freedom by drinking from the cup of bitterness and hatred. We must forever conduct our struggle on the high plane of dignity and discipline. We must not allow our creative protest to degenerate into physical violence. Again and again, we must rise to the majestic heights of meeting physical force with soul force.',
-    })} />
+    })}
+    />
   ))
   .add('Button with Input', injectSheet(styles)(observer(({ classes }: { classes: Classes }) => (
-      <div className={classes.combinedElements}>
-        <Input showLabel={false} className={classes.input} noMargin />
-        <WithStoreButton store={createStore({})} />
-      </div>
-    )),
-  ))
+    <div className={classes.combinedElements}>
+      <Input showLabel={false} className={classes.input} noMargin />
+      <WithStoreButton store={createStore({})} />
+    </div>
+    ))))
   .add('Icon Button with Input', injectSheet(styles)(observer(({ classes }: { classes: Classes }) => (
-      <div className={classes.combinedElements}>
-        <Input showLabel={false} className={classes.input} noMargin />
-        <WithStoreButton store={createStore({
+    <div className={classes.combinedElements}>
+      <Input showLabel={false} className={classes.input} noMargin />
+      <WithStoreButton store={createStore({
           icon: mdiInformation,
-        })} />
-      </div>
-    )),
-  ));
+        })}
+      />
+    </div>
+    ))));