diff --git a/build/bundle.js b/build/bundle.js index 57514a0..0af205c 100644 --- a/build/bundle.js +++ b/build/bundle.js @@ -94,7 +94,7 @@ function _possibleConstructorReturn(self, call) { return _assertThisInitialized(self); } -function bind(ComponentToBind) { +function bindToSilo(ComponentToBind) { var WrapperFunction = /*#__PURE__*/ function (_React$Component) { @@ -178,7 +178,7 @@ function bind(ComponentToBind) { return WrapperFunction; } -function objectBind(ComponentToBind, key, siloObject) { +function bindObjectToSilo(ComponentToBind, key, siloObject) { var WrapperFunction = /*#__PURE__*/ function (_React$Component) { @@ -218,7 +218,8 @@ function objectBind(ComponentToBind, key, siloObject) { } }, { key: "componentWillUnmount", - value: function componentWillUnmount() {//this.unsubscribe(); + value: function componentWillUnmount() { + this.unsubscribe(); } }]); @@ -267,11 +268,11 @@ ProviderComponent.childContextTypes = { silo: PropTypes.object }; -var bind$1 = bind; -var objectBind$1 = objectBind; +var bindToSilo$1 = bindToSilo; +var bindObjectToSilo$1 = bindObjectToSilo; var Provider = ProviderComponent; -exports.bind = bind$1; -exports.objectBind = objectBind$1; +exports.bindToSilo = bindToSilo$1; +exports.bindObjectToSilo = bindObjectToSilo$1; exports.Provider = Provider; -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"bundle.js","sources":["../reactBindings/bind.js","../reactBindings/objectBind.js","../reactBindings/Provider.js","../reactBindings/reactBindings.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types'; \n\nfunction bind(ComponentToBind) {\n    class WrapperFunction extends React.Component {\n        constructor() {\n            super();\n            this.siloRender = this.siloRender.bind(this);\n        }\n\n        componentWillMount() {\n            const {silo} = this.context;\n            this.unsubscribe = silo.subscribe(this.siloRender, ComponentToBind.prototype.constructor.name + 'State');\n        }\n\n        render() {\n            const {silo} = this.context;\n            let newState = {};\n            if(this.updatedState) {\n                newState = this.updatedState;\n            }\n            return (<ComponentToBind {...this.props} {...newState}/>)\n        }\n\n        siloRender(updatedState) {\n            this.previousUpdate = this.updatedState;\n            this.updatedState = updatedState;\n            this.forceUpdate();\n        }\n\n        componentWillUnmount() {\n            this.unsubscribe();\n        }\n\n    render() {\n      let newState = {};\n      // this.updatedState is set when siloRender is run\n      if (this.updatedState) {\n          newState = this.updatedState;\n      }\n      // pass in dev written props and the siloState\n      return (<ComponentToBind {...this.props} {...newState}/>)\n    }\n\n    siloRender(updatedState) {\n      // wrapperfunction now has a variable called updatedState\n      this.updatedState = updatedState;\n      // part of react, calls render function\n      this.forceUpdate();\n    }\n\n    componentWillUnmount() {\n      // unsubscribe removes the relevant render function from the subscribers array\n      this.unsubscribe();\n    }\n  }\n\n  // looking for something called silo that is an object \n  WrapperFunction.contextTypes = {\n      silo: PropTypes.object\n  }\n\n  return WrapperFunction;\n}\n\nexport default bind;","import React from 'react';\nimport PropTypes from 'prop-types';\n\n// siloObject is passed in to have access to keySubscribe function\nfunction objectBind(ComponentToBind, key, siloObject) {\n  class WrapperFunction extends React.Component {\n    constructor() {\n      super();\n      this.siloRender = this.siloRender.bind(this);\n    }\n\n    componentWillMount() {\n      this.unsubscribe = siloObject.keySubscribe(key, this.siloRender);\n    }\n\n    render() {\n      let newState = {};\n      if (this.updatedState) {\n          newState = this.updatedState;\n      }\n      return (<ComponentToBind {...this.props} {...newState}/>)\n    }\n\n    siloRender(updatedState) {\n      this.updatedState = updatedState;\n      this.forceUpdate();\n    }\n\n    componentWillUnmount() {\n      //this.unsubscribe();\n    }\n  }\n\n  // dont need\n  WrapperFunction.contextTypes = {\n      silo: PropTypes.object\n  }\n\n  return WrapperFunction;\n}\n\nexport default objectBind;","import React from 'react';\nimport PropTypes from 'prop-types';\n\nclass ProviderComponent extends React.Component {\n    // function definition provided by react, called by this.context\n    getChildContext() {\n        return {silo: this.props.silo}\n    }\n\n    render() {      \n      // this.props.children are any elements listed inside the component (like App)\n        return (<div> {this.props.children} </div>)\n    }\n}\n\n// we are telling it what we are going to provide\nProviderComponent.childContextTypes = {\n    silo: PropTypes.object\n}\n\nexport default ProviderComponent;","import bindImport from './bind.js';\nimport objectBindImport from './objectBind.js';\nimport ProviderImport from './Provider.js';\n\nexport const bind = bindImport;\nexport const objectBind = objectBindImport;\nexport const Provider = ProviderImport;"],"names":["bind","ComponentToBind","WrapperFunction","siloRender","silo","context","unsubscribe","subscribe","prototype","constructor","name","newState","updatedState","props","previousUpdate","forceUpdate","React","Component","contextTypes","PropTypes","object","objectBind","key","siloObject","keySubscribe","ProviderComponent","children","childContextTypes","bindImport","objectBindImport","Provider","ProviderImport"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,SAASA,IAAT,CAAcC,eAAd,EAA+B;MACrBC,eADqB;;;;;+BAET;;;;;;YAELC,UAAL,GAAkB,MAAKA,UAAL,CAAgBH,IAAhB,uDAAlB;;;;;;2CAGiB;YACVI,IADU,GACF,KAAKC,OADH,CACVD,IADU;aAEZE,WAAL,GAAmBF,IAAI,CAACG,SAAL,CAAe,KAAKJ,UAApB,EAAgCF,eAAe,CAACO,SAAhB,CAA0BC,WAA1B,CAAsCC,IAAtC,GAA6C,OAA7E,CAAnB;;;;+BAGK;YACEN,IADF,GACU,KAAKC,OADf,CACED,IADF;YAEDO,QAAQ,GAAG,EAAf;;YACG,KAAKC,YAAR,EAAsB;UAClBD,QAAQ,GAAG,KAAKC,YAAhB;;;eAEI,oBAAC,eAAD,eAAqB,KAAKC,KAA1B,EAAqCF,QAArC,EAAR;;;;iCAGOC,YArBY,EAqBE;aAChBE,cAAL,GAAsB,KAAKF,YAA3B;aACKA,YAAL,GAAoBA,YAApB;aACKG,WAAL;;;;6CAGmB;aACdT,WAAL;;;;+BAGC;YACHK,QAAQ,GAAG,EAAf,CADO;;YAGH,KAAKC,YAAT,EAAuB;UACnBD,QAAQ,GAAG,KAAKC,YAAhB;SAJG;;;eAOC,oBAAC,eAAD,eAAqB,KAAKC,KAA1B,EAAqCF,QAArC,EAAR;;;;iCAGSC,YAzCgB,EAyCF;;aAElBA,YAAL,GAAoBA,YAApB,CAFuB;;aAIlBG,WAAL;;;;6CAGqB;;aAEhBT,WAAL;;;;;IAjD4BU,KAAK,CAACC,SADT;;;EAuD7Bf,eAAe,CAACgB,YAAhB,GAA+B;IAC3Bd,IAAI,EAAEe,SAAS,CAACC;GADpB;SAIOlB,eAAP;;;AC1DF,SAASmB,UAAT,CAAoBpB,eAApB,EAAqCqB,GAArC,EAA0CC,UAA1C,EAAsD;MAC9CrB,eAD8C;;;;;+BAEpC;;;;;;YAEPC,UAAL,GAAkB,MAAKA,UAAL,CAAgBH,IAAhB,uDAAlB;;;;;;2CAGmB;aACdM,WAAL,GAAmBiB,UAAU,CAACC,YAAX,CAAwBF,GAAxB,EAA6B,KAAKnB,UAAlC,CAAnB;;;;+BAGO;YACHQ,QAAQ,GAAG,EAAf;;YACI,KAAKC,YAAT,EAAuB;UACnBD,QAAQ,GAAG,KAAKC,YAAhB;;;eAEI,oBAAC,eAAD,eAAqB,KAAKC,KAA1B,EAAqCF,QAArC,EAAR;;;;iCAGSC,YAnBuC,EAmBzB;aAClBA,YAAL,GAAoBA,YAApB;aACKG,WAAL;;;;6CAGqB;;;;;IAvBKC,KAAK,CAACC,SADgB;;;EA8BpDf,eAAe,CAACgB,YAAhB,GAA+B;IAC3Bd,IAAI,EAAEe,SAAS,CAACC;GADpB;SAIOlB,eAAP;;;ICnCIuB;;;;;;;;;;;;;;sCAEgB;aACP;QAACrB,IAAI,EAAE,KAAKS,KAAL,CAAWT;OAAzB;;;;6BAGK;;aAEG,sCAAO,KAAKS,KAAL,CAAWa,QAAlB,MAAR;;;;;EARwBV,KAAK,CAACC;;;AAatCQ,iBAAiB,CAACE,iBAAlB,GAAsC;EAClCvB,IAAI,EAAEe,SAAS,CAACC;CADpB;;ICZapB,MAAI,GAAG4B;AACpB,IAAaP,YAAU,GAAGQ;AAC1B,IAAaC,QAAQ,GAAGC;;;;;;"} +//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"bundle.js","sources":["../reactBindings/bindToSilo.js","../reactBindings/bindObjectToSilo.js","../reactBindings/Provider.js","../reactBindings/reactBindings.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types'; \n\nfunction bindToSilo(ComponentToBind) {\n    class WrapperFunction extends React.Component {\n        constructor() {\n            super();\n            this.siloRender = this.siloRender.bind(this);\n        }\n\n        componentWillMount() {\n            const {silo} = this.context;\n            this.unsubscribe = silo.subscribe(this.siloRender, ComponentToBind.prototype.constructor.name + 'State');\n        }\n\n        render() {\n            const {silo} = this.context;\n            let newState = {};\n            if(this.updatedState) {\n                newState = this.updatedState;\n            }\n            return (<ComponentToBind {...this.props} {...newState}/>)\n        }\n\n        siloRender(updatedState) {\n            this.previousUpdate = this.updatedState;\n            this.updatedState = updatedState;\n            this.forceUpdate();\n        }\n\n        componentWillUnmount() {\n            this.unsubscribe();\n        }\n\n    render() {\n      let newState = {};\n      // this.updatedState is set when siloRender is run\n      if (this.updatedState) {\n          newState = this.updatedState;\n      }\n      // pass in dev written props and the siloState\n      return (<ComponentToBind {...this.props} {...newState}/>)\n    }\n\n    siloRender(updatedState) {\n      // wrapperfunction now has a variable called updatedState\n      this.updatedState = updatedState;\n      // part of react, calls render function\n      this.forceUpdate();\n    }\n\n    componentWillUnmount() {\n      // unsubscribe removes the relevant render function from the subscribers array\n      this.unsubscribe();\n    }\n  }\n\n  // looking for something called silo that is an object \n  WrapperFunction.contextTypes = {\n      silo: PropTypes.object\n  }\n\n  return WrapperFunction;\n}\n\nexport default bindToSilo;","import React from 'react';\nimport PropTypes from 'prop-types';\n\n// siloObject is passed in to have access to keySubscribe function\nfunction bindObjectToSilo(ComponentToBind, key, siloObject) {\n  class WrapperFunction extends React.Component {\n    constructor() {\n      super();\n      this.siloRender = this.siloRender.bind(this);\n    }\n\n    componentWillMount() {\n      this.unsubscribe = siloObject.keySubscribe(key, this.siloRender);\n    }\n\n    render() {\n      let newState = {};\n      if (this.updatedState) {\n          newState = this.updatedState;\n      }\n      return (<ComponentToBind {...this.props} {...newState}/>)\n    }\n\n    siloRender(updatedState) {\n      this.updatedState = updatedState;\n      this.forceUpdate();\n    }\n\n    componentWillUnmount() {\n      this.unsubscribe();\n    }\n  }\n\n  // dont need\n  WrapperFunction.contextTypes = {\n      silo: PropTypes.object\n  }\n\n  return WrapperFunction;\n}\n\nexport default bindObjectToSilo;","import React from 'react';\nimport PropTypes from 'prop-types';\n\nclass ProviderComponent extends React.Component {\n    // function definition provided by react, called by this.context\n    getChildContext() {\n        return {silo: this.props.silo}\n    }\n\n    render() {      \n      // this.props.children are any elements listed inside the component (like App)\n        return (<div> {this.props.children} </div>)\n    }\n}\n\n// we are telling it what we are going to provide\nProviderComponent.childContextTypes = {\n    silo: PropTypes.object\n}\n\nexport default ProviderComponent;","import bindImport from './bindToSilo';\nimport objectBindImport from './bindObjectToSilo.js';\nimport ProviderImport from './Provider.js';\n\nexport const bindToSilo = bindImport;\nexport const bindObjectToSilo = objectBindImport;\nexport const Provider = ProviderImport;"],"names":["bindToSilo","ComponentToBind","WrapperFunction","siloRender","bind","silo","context","unsubscribe","subscribe","prototype","constructor","name","newState","updatedState","props","previousUpdate","forceUpdate","React","Component","contextTypes","PropTypes","object","bindObjectToSilo","key","siloObject","keySubscribe","ProviderComponent","children","childContextTypes","bindImport","objectBindImport","Provider","ProviderImport"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,SAASA,UAAT,CAAoBC,eAApB,EAAqC;MAC3BC,eAD2B;;;;;+BAEf;;;;;;YAELC,UAAL,GAAkB,MAAKA,UAAL,CAAgBC,IAAhB,uDAAlB;;;;;;2CAGiB;YACVC,IADU,GACF,KAAKC,OADH,CACVD,IADU;aAEZE,WAAL,GAAmBF,IAAI,CAACG,SAAL,CAAe,KAAKL,UAApB,EAAgCF,eAAe,CAACQ,SAAhB,CAA0BC,WAA1B,CAAsCC,IAAtC,GAA6C,OAA7E,CAAnB;;;;+BAGK;YACEN,IADF,GACU,KAAKC,OADf,CACED,IADF;YAEDO,QAAQ,GAAG,EAAf;;YACG,KAAKC,YAAR,EAAsB;UAClBD,QAAQ,GAAG,KAAKC,YAAhB;;;eAEI,oBAAC,eAAD,eAAqB,KAAKC,KAA1B,EAAqCF,QAArC,EAAR;;;;iCAGOC,YArBkB,EAqBJ;aAChBE,cAAL,GAAsB,KAAKF,YAA3B;aACKA,YAAL,GAAoBA,YAApB;aACKG,WAAL;;;;6CAGmB;aACdT,WAAL;;;;+BAGC;YACHK,QAAQ,GAAG,EAAf,CADO;;YAGH,KAAKC,YAAT,EAAuB;UACnBD,QAAQ,GAAG,KAAKC,YAAhB;SAJG;;;eAOC,oBAAC,eAAD,eAAqB,KAAKC,KAA1B,EAAqCF,QAArC,EAAR;;;;iCAGSC,YAzCsB,EAyCR;;aAElBA,YAAL,GAAoBA,YAApB,CAFuB;;aAIlBG,WAAL;;;;6CAGqB;;aAEhBT,WAAL;;;;;IAjD4BU,KAAK,CAACC,SADH;;;EAuDnChB,eAAe,CAACiB,YAAhB,GAA+B;IAC3Bd,IAAI,EAAEe,SAAS,CAACC;GADpB;SAIOnB,eAAP;;;AC1DF,SAASoB,gBAAT,CAA0BrB,eAA1B,EAA2CsB,GAA3C,EAAgDC,UAAhD,EAA4D;MACpDtB,eADoD;;;;;+BAE1C;;;;;;YAEPC,UAAL,GAAkB,MAAKA,UAAL,CAAgBC,IAAhB,uDAAlB;;;;;;2CAGmB;aACdG,WAAL,GAAmBiB,UAAU,CAACC,YAAX,CAAwBF,GAAxB,EAA6B,KAAKpB,UAAlC,CAAnB;;;;+BAGO;YACHS,QAAQ,GAAG,EAAf;;YACI,KAAKC,YAAT,EAAuB;UACnBD,QAAQ,GAAG,KAAKC,YAAhB;;;eAEI,oBAAC,eAAD,eAAqB,KAAKC,KAA1B,EAAqCF,QAArC,EAAR;;;;iCAGSC,YAnB6C,EAmB/B;aAClBA,YAAL,GAAoBA,YAApB;aACKG,WAAL;;;;6CAGqB;aAChBT,WAAL;;;;;IAxB0BU,KAAK,CAACC,SADsB;;;EA8B1DhB,eAAe,CAACiB,YAAhB,GAA+B;IAC3Bd,IAAI,EAAEe,SAAS,CAACC;GADpB;SAIOnB,eAAP;;;ICnCIwB;;;;;;;;;;;;;;sCAEgB;aACP;QAACrB,IAAI,EAAE,KAAKS,KAAL,CAAWT;OAAzB;;;;6BAGK;;aAEG,sCAAO,KAAKS,KAAL,CAAWa,QAAlB,MAAR;;;;;EARwBV,KAAK,CAACC;;;AAatCQ,iBAAiB,CAACE,iBAAlB,GAAsC;EAClCvB,IAAI,EAAEe,SAAS,CAACC;CADpB;;ICZarB,YAAU,GAAG6B;AAC1B,IAAaP,kBAAgB,GAAGQ;AAChC,IAAaC,QAAQ,GAAGC;;;;;;"} diff --git a/demos/radon/client/components/MarketCreator.jsx b/demos/radon/client/components/MarketCreator.jsx index a5f2a37..a1560dc 100644 --- a/demos/radon/client/components/MarketCreator.jsx +++ b/demos/radon/client/components/MarketCreator.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import {bind} from 'react-radon'; +import {bindToSilo} from 'react-radon'; class MarketCreator extends React.Component { render() { @@ -16,4 +16,4 @@ class MarketCreator extends React.Component { } } -export default bind(MarketCreator); \ No newline at end of file +export default bindToSilo(MarketCreator); \ No newline at end of file diff --git a/demos/radon/client/components/MarketDisplay.jsx b/demos/radon/client/components/MarketDisplay.jsx index 67e2500..4f0a145 100644 --- a/demos/radon/client/components/MarketDisplay.jsx +++ b/demos/radon/client/components/MarketDisplay.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import {bind} from 'react-radon'; +import {bindToSilo} from 'react-radon'; const MarketDisplay = (props) => (
@@ -8,4 +8,4 @@ const MarketDisplay = (props) => (
); -export default bind(MarketDisplay); \ No newline at end of file +export default bindToSilo(MarketDisplay); \ No newline at end of file diff --git a/demos/radon/client/components/MarketsDisplay.jsx b/demos/radon/client/components/MarketsDisplay.jsx index 27476a0..2c7010a 100644 --- a/demos/radon/client/components/MarketsDisplay.jsx +++ b/demos/radon/client/components/MarketsDisplay.jsx @@ -1,6 +1,6 @@ import React from 'react'; import MarketDisplay from './MarketDisplay.jsx'; -import {bind} from 'react-radon'; +import {bindToSilo} from 'react-radon'; const MarketsDisplay = (props) => { @@ -12,4 +12,4 @@ const MarketsDisplay = (props) => { ); }; -export default bind(MarketsDisplay); \ No newline at end of file +export default bindToSilo(MarketsDisplay); \ No newline at end of file diff --git a/demos/radon/client/components/TotalsDisplay.jsx b/demos/radon/client/components/TotalsDisplay.jsx index 824048c..35132d8 100644 --- a/demos/radon/client/components/TotalsDisplay.jsx +++ b/demos/radon/client/components/TotalsDisplay.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import {bind} from 'react-radon'; +import {bindToSilo} from 'react-radon'; class TotalsDisplay extends React.Component{ render() { @@ -12,4 +12,4 @@ class TotalsDisplay extends React.Component{ ); } } -export default bind(TotalsDisplay); \ No newline at end of file +export default bindToSilo(TotalsDisplay); \ No newline at end of file diff --git a/demos/radon/client/containers/MainContainer.jsx b/demos/radon/client/containers/MainContainer.jsx index 4e761f7..058dfd1 100644 --- a/demos/radon/client/containers/MainContainer.jsx +++ b/demos/radon/client/containers/MainContainer.jsx @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import TotalsDisplay from '../components/TotalsDisplay.jsx'; import MarketsContainer from './MarketsContainer.jsx' -import {bind} from 'react-radon'; +import {bindToSilo} from 'react-radon'; class MainContainer extends Component { constructor(props) { @@ -21,4 +21,4 @@ class MainContainer extends Component { } } -export default bind(MainContainer); \ No newline at end of file +export default bindToSilo(MainContainer); \ No newline at end of file diff --git a/demos/radon/client/containers/MarketsContainer.jsx b/demos/radon/client/containers/MarketsContainer.jsx index 0cf7a4c..49856ef 100644 --- a/demos/radon/client/containers/MarketsContainer.jsx +++ b/demos/radon/client/containers/MarketsContainer.jsx @@ -2,7 +2,7 @@ import React, { Component } from 'react'; import MarketCreator from '../components/MarketCreator.jsx' import MarketsDisplay from '../components/MarketDisplay.jsx' import Market from '../components/Market.jsx'; -import {bind, objectBind} from 'react-radon'; +import {bindToSilo, bindObjectToSilo} from 'react-radon'; class MarketsContainer extends Component { constructor(props) { @@ -40,7 +40,7 @@ class MarketsContainer extends Component { let marketData = this.props.val.marketList.val; for(let i in marketData){ - let ArrMarket = objectBind(Market, i, this.props.val.marketList); + let ArrMarket = bindObjectToSilo(Market, i, this.props.val.marketList); markets.push() } @@ -55,4 +55,4 @@ class MarketsContainer extends Component { } } -export default bind(MarketsContainer); \ No newline at end of file +export default bindToSilo(MarketsContainer); \ No newline at end of file diff --git a/demos/radon/package.json b/demos/radon/package.json index 3946aea..5511ceb 100644 --- a/demos/radon/package.json +++ b/demos/radon/package.json @@ -15,10 +15,10 @@ "path": "^0.12.7", "prop-types": "^15.6.2", "radon-devtool": "^1.0.11", - "radon-js": "^3.2.16", + "radon-js": "^3.3.0", "react": "^16.5.1", "react-dom": "^16.5.1", - "react-radon": "^1.0.12", + "react-radon": "^1.0.15", "webpack": "^4.19.0" }, "devDependencies": { diff --git a/package.json b/package.json index 43d082a..96389a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-radon", - "version": "1.0.12", + "version": "1.0.14", "description": "Radon is an object-oriented state management framework for JavaScript applications.", "main": "build/bundle.js", "files": [ diff --git a/reactBindings/objectBind.js b/reactBindings/bindObjectToSilo.js similarity index 87% rename from reactBindings/objectBind.js rename to reactBindings/bindObjectToSilo.js index b37a761..4d93ceb 100644 --- a/reactBindings/objectBind.js +++ b/reactBindings/bindObjectToSilo.js @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; // siloObject is passed in to have access to keySubscribe function -function objectBind(ComponentToBind, key, siloObject) { +function bindObjectToSilo(ComponentToBind, key, siloObject) { class WrapperFunction extends React.Component { constructor() { super(); @@ -27,7 +27,7 @@ function objectBind(ComponentToBind, key, siloObject) { } componentWillUnmount() { - //this.unsubscribe(); + this.unsubscribe(); } } @@ -39,4 +39,4 @@ function objectBind(ComponentToBind, key, siloObject) { return WrapperFunction; } -export default objectBind; \ No newline at end of file +export default bindObjectToSilo; \ No newline at end of file diff --git a/reactBindings/bind.js b/reactBindings/bindToSilo.js similarity index 96% rename from reactBindings/bind.js rename to reactBindings/bindToSilo.js index 48d5675..6347d42 100644 --- a/reactBindings/bind.js +++ b/reactBindings/bindToSilo.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -function bind(ComponentToBind) { +function bindToSilo(ComponentToBind) { class WrapperFunction extends React.Component { constructor() { super(); @@ -63,4 +63,4 @@ function bind(ComponentToBind) { return WrapperFunction; } -export default bind; \ No newline at end of file +export default bindToSilo; \ No newline at end of file diff --git a/reactBindings/reactBindings.js b/reactBindings/reactBindings.js index 0690c29..74f2050 100644 --- a/reactBindings/reactBindings.js +++ b/reactBindings/reactBindings.js @@ -1,7 +1,7 @@ -import bindImport from './bind.js'; -import objectBindImport from './objectBind.js'; +import bindImport from './bindToSilo'; +import objectBindImport from './bindObjectToSilo.js'; import ProviderImport from './Provider.js'; -export const bind = bindImport; -export const objectBind = objectBindImport; +export const bindToSilo = bindImport; +export const bindObjectToSilo = objectBindImport; export const Provider = ProviderImport; \ No newline at end of file