fix: typo #104

karasjs · Nov 5, 2020 · c8f824c · c8f824c
1 parent bf390d3
commit c8f824c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 62 deletions.
diff --git a/index.js b/index.js
@@ -14758,23 +14758,7 @@
         }
       }
     });
-  }); // ['__struct'].forEach(fn => {
-  //   Object.defineProperty(Component.prototype, fn, {
-  //     get() {
-  //       let sr = this.shadowRoot;
-  //       if(sr) {
-  //         return sr[fn];
-  //       }
-  //     },
-  //     set(v) {
-  //       let sr = this.shadowRoot;
-  //       if(sr) {
-  //         sr[fn] = v;
-  //       }
-  //     },
-  //   });
-  // });
-
+  });
   ['__layout', '__layoutAbs', '__tryLayInline', '__offsetX', '__offsetY', '__calAutoBasis', '__calMp', '__calAbs', '__renderAsMask', '__renderByMask', '__mp', 'animate', 'removeAnimate', 'clearAnimate', 'updateStyle', 'deepScan', '__cancelCache', '__applyCache', '__mergeBbox', '__structure', '__modifyStruct'].forEach(function (fn) {
     Component$1.prototype[fn] = function () {
       var sr = this.shadowRoot;
@@ -15490,10 +15474,9 @@
         var d = 0;
 
         if (this !== root) {
-          var _d = this.__struct.total - struct.total;
-
+          d = this.__struct.total - struct.total;
           struct = this.domParent.__struct;
-          struct.total += _d;
+          struct.total += d;
         }
 
         return [this.__struct, d];
@@ -18226,18 +18209,7 @@
     }
 
     sr.__parent = oldSr.parent;
-    sr.__struct = oldSr.__struct; // let s = cp.shadow;
-    // if(s instanceof Xom) {
-    //   s.__width = oldS.width;
-    //   s.__height = oldS.height;
-    //   s.__computedStyle = oldS.computedStyle;
-    //   s.__layoutData = oldS.layoutData;
-    // }
-    // else {
-    //   s.__parent = oldS.parent;
-    // }
-    // s.__struct = oldS.__struct;
-
+    sr.__struct = oldSr.__struct;
     updateList.push(cp); // 老的需回收，diff会生成新的dom，唯一列外是cp直接返回一个没变化的cp
 
     if (!util.isObject(json) || !json.placeholder) {

diff --git a/index.js.map b/index.js.map
diff --git a/src/node/Component.js b/src/node/Component.js
@@ -284,23 +284,6 @@ Object.keys(change.GEOM).concat([
   });
 });
 
-// ['__struct'].forEach(fn => {
-//   Object.defineProperty(Component.prototype, fn, {
-//     get() {
-//       let sr = this.shadowRoot;
-//       if(sr) {
-//         return sr[fn];
-//       }
-//     },
-//     set(v) {
-//       let sr = this.shadowRoot;
-//       if(sr) {
-//         sr[fn] = v;
-//       }
-//     },
-//   });
-// });
-
 [
   '__layout',
   '__layoutAbs',

diff --git a/src/node/Dom.js b/src/node/Dom.js
@@ -139,7 +139,7 @@ class Dom extends Xom {
     root.__structs.splice(struct.index + offset, struct.total + 1, ...ns);
     let d = 0;
     if(this !== root) {
-      let d = this.__struct.total - struct.total;
+      d = this.__struct.total - struct.total;
       struct = this.domParent.__struct;
       struct.total += d;
     }

diff --git a/src/util/updater.js b/src/util/updater.js
@@ -85,17 +85,6 @@ function updateCp(cp, props, state) {
   }
   sr.__parent = oldSr.parent;
   sr.__struct = oldSr.__struct;
-  // let s = cp.shadow;
-  // if(s instanceof Xom) {
-  //   s.__width = oldS.width;
-  //   s.__height = oldS.height;
-  //   s.__computedStyle = oldS.computedStyle;
-  //   s.__layoutData = oldS.layoutData;
-  // }
-  // else {
-  //   s.__parent = oldS.parent;
-  // }
-  // s.__struct = oldS.__struct;
   updateList.push(cp);
   // 老的需回收，diff会生成新的dom，唯一列外是cp直接返回一个没变化的cp
   if(!util.isObject(json) || !json.placeholder) {