Revert "Handle parameters change"

This reverts commit 91ad09d.

Author: usulpro

.storybook/stories.js

@@ -21,13 +21,14 @@ storiesOf('Storybook Addon Development Kit', module)
   .add(
     'Stories',
     () => {
+      console.log('Render Button 1');
       return (
         <div>
           <button>Button 1</button>
         </div>
       );
     },
-    adkParams({ currentTheme: 33 })
+    adkParams({ currentTheme: 1 })
   )
   .add(
     'Stories2',

dev/withAdk.js

@@ -13,5 +13,5 @@ const DecoratorUI = ({ context, getStory, theme, info }) => (
 export const withAdk = createDecorator({
   theme: store => store.themes[store.currentTheme],
   info: store => JSON.stringify(store, null, 2)
-})(DecoratorUI, { isGlobal: true, priorityOfparams: false });
+})(DecoratorUI, { isGlobal: true });
 export const adkParams = setParameters();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-devkit",
-  "version": "1.2.1",
+  "version": "1.2.0",
   "description": "Storybook Addon Development Kit",
   "author": {
     "name": "Oleg Proskurin",

src/ChannelStore.js

@@ -62,7 +62,6 @@ export default class ChannelStore {
     );
 
   onInitChannel = initData => {
-  console.log("TCL: ChannelStore -> onConnectedFn -> initData", initData)
     const { data, id } = initData;
     const selectorId = id || GLOBAL;
     const selectedData = { ...(this.store[selectorId] || {}) };

src/decorator.js

@@ -3,13 +3,9 @@ import withChannel from './withChannel';
 
 import { getConfig } from './config';
 
-const DecoratorHOC = ({ actions, selectors, Component, parameters, resetParameters, ...props }) => {
-  React.useEffect(() => {
-    console.log('Effect:\n', parameters);
-    resetParameters(parameters);
-  }, [parameters, resetParameters]);
-  return <Component {...actions} {...selectors} {...props} />
-};
+const DecoratorHOC = ({ actions, selectors, Component, ...props }) => (
+  <Component {...actions} {...selectors} {...props} />
+);
 
 export const createDecorator = (storeSelectors, createActions) => (
   Component,
@@ -26,8 +22,6 @@ export const createDecorator = (storeSelectors, createActions) => (
   const parameters = context.parameters && context.parameters[PARAM_Key];
   const storyId = isGlobal ? null : context.id;
 
-  // const [prms, setParams] =
-
   const WithChannel = withChannel({
     EVENT_ID_INIT,
     EVENT_ID_DATA,

src/withChannel.js

@@ -41,7 +41,7 @@ const withChannel = ({
 
         this.state = {
           data: initStateData,
-          selectors: isReceived ? this.executeSelectors(initStateData) : {},
+          selectors: isReceived ? this.prepareSelectors(initStateData) : {},
           isReceived,
         };
 
@@ -60,7 +60,7 @@ const withChannel = ({
 
       isPanel = this.props.panel || panel;
 
-      executeSelectors = store => {
+      prepareSelectors = store => {
         return Object.entries(storeSelectors)
           .map(([name, selector]) => ({
             [name]: tryToSelect(selector)(store),
@@ -93,14 +93,14 @@ const withChannel = ({
 
       componentWillUnmount() {
         this.debugLog('componentWillUnmount');
-        this.store.disconnect();
-      }
+      this.store.disconnect();
+    }
 
-      // debug = true;
-      debug = false;
+    // debug = true;
+    debug = false;
 
-      debugLog = message => {
-        if (!this.debug) {
+    debugLog = message => {
+      if (!this.debug) {
           return;
         }
         console.log(
@@ -114,45 +114,16 @@ const withChannel = ({
         this.setState({
           data,
           isReceived: true,
-          selectors: this.executeSelectors(data),
+          selectors: this.prepareSelectors(data),
         });
       };
 
-      resetParameters = parameters => {
-        const initStateData = {
-          ...initData,
-          ...this.props.initData,
-          ...parameters,
-        };
-        this.setState({
-          data: initStateData,
-          selectors: this.state.isReceived ? this.executeSelectors(initStateData) : {},
-        });
-        this.store.sendInit(initStateData);
-      }
-
       render() {
         const { pointName, initData, active, onData, ...props } = this.props;
-        const { data, isReceived } = this.state;
+        const { data, isReceived, selectors } = this.state;
 
         if (active === false) return null;
 
-        const initStateData = {
-            ...initData,
-            ...parameters,
-            ...data,
-          };
-
-        let selectors;
-        try {
-          selectors = this.executeSelectors(initStateData)
-        } catch (err) {
-          selectors = this.state.selectors;
-        }
-
-        console.log('Render', parameters);
-
-
         return (
           <WrappedComponent
             data={data}
@@ -163,7 +134,6 @@ const withChannel = ({
             selectors={selectors}
             actions={this.actions}
             isFirstDataReceived={isReceived}
-            resetParameters={this.resetParameters}
             {...props}
           />
         );