remove useless level state

klee-contrib · Apr 14, 2016 · eb52aef · eb52aef
1 parent 45ce4eb
commit eb52aef
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 27 deletions.
diff --git a/src/application/popin/example/index.jsx b/src/application/popin/example/index.jsx
@@ -10,6 +10,14 @@ const getLevel = function getLevel() {
 
 const MyMenu = React.createClass({
 
+    getInitialState() {
+        return ({
+            levelPopin1: 0,
+            levelPopin2: 0,
+            levelPopin3: 0,
+        });
+    },
+
     goHome() {
         window.location.href = '#'
     },
@@ -25,13 +33,16 @@ const MyMenu = React.createClass({
             {
                 icon: 'notifications',
                 onClick() {
+                    self.setState({levelPopin1:getLevel() });
                     self.refs.popin.togglePopin();
                 }
             },
             {
                 icon: 'chat',
                 onClick() {
+                    self.setState({levelPopin3:getLevel() });
                     self.refs.thirdPopin.togglePopin();
+
                 }
             }
         ]
@@ -49,14 +60,17 @@ const MyMenu = React.createClass({
     },
     makeTheSecondPopinPop() {
         const self = this;
+        self.setState({levelPopin2:getLevel()});
         self.refs.secondPopin.setState({dynamicPopin: 0});
         return self.refs.secondPopin.togglePopin();
     },
     makeTheThirdPopinPop() {
         const self = this;
+        self.setState({levelPopin3:getLevel() });
         return self.refs.thirdPopin.togglePopin();
     },
     render() {
+        const {levelPopin1,levelPopin2,levelPopin3} = this.state;
         return (
             <div>
                 <MenuLeft items={this.itemsBuilder()} handleBrandClick={this.goHome}>
@@ -89,22 +103,22 @@ const MyMenu = React.createClass({
                         </h5>
                     </div>
                 </div>
-                <MyPopin ref='popin'/>
-                <SecondPopin ref='secondPopin'/>
-                <ThirdPopin ref='thirdPopin'/>
+                <MyPopin ref='popin' level={levelPopin1}/>
+                <SecondPopin ref='secondPopin'  level={levelPopin2}/>
+                <ThirdPopin ref='thirdPopin'  level={levelPopin3}/>
             </div>
         );
     }
 });
 
 const MyPopin = React.createClass({
     togglePopin() {
-        this.refs.popin.setLevel(getLevel());
         this.refs.popin.toggleOpen();
     },
     render() {
+        const {level}= this.props;
         return (
-            <Popin ref='popin' size='small' type='from-menu' modal={false}>
+            <Popin ref='popin' size='small' type='from-menu' modal={false} level={level} >
                 <h2>
                     News
                 </h2>
@@ -130,15 +144,13 @@ const SecondPopin = React.createClass({
         return {dynamicPopin: 0};
     },
     togglePopin() {
-        this.refs.secondPopin.setLevel(getLevel());
         this.refs.secondPopin.toggleOpen();
     },
     _renderDynamicPopin(){
         const colors = ['grey', 'Cornsilk', 'Gainsboro', 'LightCyan '];
         const popins = Array.from(Array(this.state.dynamicPopin).keys())
             .map(idx => {
                 const colorStyle = {backgroundColor: colors[idx % colors.length]};
-                //const popinTile = 'Popin ' + (idx+1);
                 const popinTile = `Popin ${idx + 1}`;
                 return (
                     <Popin key={idx} size='small' overlay={false} open={true} level={getLevel()}>
@@ -153,8 +165,9 @@ const SecondPopin = React.createClass({
         this.setState({dynamicPopin: this.state.dynamicPopin + 1});
     },
     render() {
+        const {level}= this.props;
         return (
-            <Popin ref='secondPopin' id='secondPopin' size='medium' overlay={false}>
+            <Popin ref='secondPopin' id='secondPopin' size='medium' overlay={false} level={level}>
                 <h2>
                     The Modal, The Medium and The Full !
                 </h2>
@@ -180,12 +193,12 @@ const SecondPopin = React.createClass({
 
 const ThirdPopin = React.createClass({
     togglePopin() {
-        this.refs.thirdPopin.setLevel(getLevel());
         this.refs.thirdPopin.toggleOpen();
     },
     render() {
+        const {level}= this.props;
         return (
-            <Popin ref='thirdPopin' size='small' type='from-right'>
+            <Popin ref='thirdPopin' size='small' type='from-right' level={level}>
                 <h2>
                     Material Design Videos
                 </h2>

diff --git a/src/application/popin/index.js b/src/application/popin/index.js
@@ -72,7 +72,6 @@ const popin = {
     getInitialState() {
         return ({
             opened: this.props.open,
-            level: this.props.level,
         });
     },
     /**
@@ -162,22 +161,10 @@ const popin = {
             window.addEventListener('keydown', this.handleKeyDown, true);
         }
     },
-    componentWillReceiveProps(nextProps){
-        const {level} = nextProps;
-        if(level){
-            this.setState({level:level});
-        }
-    },
     componentWillUnmount() {
         window.clearTimeout(this._openTimeoutID);
     },
-    /**
-     * set the z-order level of the popin
-     * @param level
-     */
-    setLevel(level) {
-        this.setState({level: level});
-    },
+
     /**
      * keyboard event handler
      * close the popin with esc
@@ -194,7 +181,7 @@ const popin = {
                     return prec;
                 }, []);
 
-                const level = this.state.level;
+                const {level} = this.props;
                 if (max(popins) === level) {
                     this.toggleOpen();
                     e.stopPropagation();
@@ -208,8 +195,7 @@ const popin = {
      * @return {XML} the rendered HTML
      */
     render() { // test for this.state.opened and return an Overlay component if true
-        const {type, modal, overlay, children} = this.props;
-        const {level} = this.state;
+        const {level,type, modal, overlay, children} = this.props;
         return (
             <div data-focus='popin' data-level={level} data-size={this._validateSize()} data-type={type}>
                 {this.state.opened &&