igniteui-webcomponents-data-grids 7.1.0-alpha.3 → 7.1.0-beta.0

package/esm2015/lib/igc-text-header-cell-info.js

@@ -26,151 +26,151 @@ export class IgcTextHeaderCellInfo extends IgcTextCellInfo {
      * Sets or gets whether the filter UI should be visible in the header.
     */
     get isColumnOptionsEnabled() {
-        return this.i.om;
+        return this.i.oq;
     }
     set isColumnOptionsEnabled(v) {
-        this.i.om = ensureBool(v);
+        this.i.oq = ensureBool(v);
     }
     get sortIndicatorStyle() {
-        return this.i.oe;
+        return this.i.oi;
     }
     set sortIndicatorStyle(v) {
-        this.i.oe = ensureEnum(SortIndicatorStyle_$type, v);
+        this.i.oi = ensureEnum(SortIndicatorStyle_$type, v);
     }
     /**
      * Gets or sets the alignment of the column options icon within the header cell.
     */
     get columnOptionsIconAlignment() {
-        return this.i.oa;
+        return this.i.oe;
     }
     set columnOptionsIconAlignment(v) {
-        this.i.oa = ensureEnum(ColumnOptionsIconAlignment_$type, v);
+        this.i.oe = ensureEnum(ColumnOptionsIconAlignment_$type, v);
     }
     /**
      * Gets or sets the color for the column options icon in the header.
     */
     get columnOptionsIconColor() {
-        return brushToString(this.i.p5);
+        return brushToString(this.i.p9);
     }
     set columnOptionsIconColor(v) {
-        this.i.p5 = stringToBrush(v);
+        this.i.p9 = stringToBrush(v);
     }
     /**
      * Gets or sets how the column option icon will behave in the header.
     */
     get columnOptionsIconBehavior() {
-        return this.i.oc;
+        return this.i.og;
     }
     set columnOptionsIconBehavior(v) {
-        this.i.oc = ensureEnum(ColumnOptionsIconBehavior_$type, v);
+        this.i.og = ensureEnum(ColumnOptionsIconBehavior_$type, v);
     }
     /**
      * Gets or sets the column options theme.
     */
     get columnOptionsTheme() {
-        return this.i.og;
+        return this.i.ok;
     }
     set columnOptionsTheme(v) {
-        this.i.og = ensureEnum(BaseControlTheme_$type, v);
+        this.i.ok = ensureEnum(BaseControlTheme_$type, v);
     }
     /**
      * Gets or sets the column options dropdown background color.
     */
     get columnOptionsBackground() {
-        return brushToString(this.i.p0);
+        return brushToString(this.i.p4);
     }
     set columnOptionsBackground(v) {
-        this.i.p0 = stringToBrush(v);
+        this.i.p4 = stringToBrush(v);
     }
     /**
      * Gets or sets the text color for text inside the column options menu.
     */
     get columnOptionsTextColor() {
-        return brushToString(this.i.p7);
+        return brushToString(this.i.qb);
     }
     set columnOptionsTextColor(v) {
-        this.i.p7 = stringToBrush(v);
+        this.i.qb = stringToBrush(v);
     }
     /**
      * Gets or sets the font settings for text inside the column options menu.
     */
     get columnOptionsTextStyle() {
-        if (this.i.ok == null) {
+        if (this.i.oo == null) {
             return null;
         }
-        return this.i.ok.fontString;
+        return this.i.oo.fontString;
     }
     set columnOptionsTextStyle(v) {
         let fi = new FontInfo();
         fi.fontString = v;
-        this.i.ok = fi;
+        this.i.oo = fi;
     }
     get columnOptionsHoverBackgroundColor() {
-        return brushToString(this.i.p4);
+        return brushToString(this.i.p8);
     }
     set columnOptionsHoverBackgroundColor(v) {
-        this.i.p4 = stringToBrush(v);
+        this.i.p8 = stringToBrush(v);
     }
     get columnOptionsToolTipBackgroundColor() {
-        return brushToString(this.i.p8);
+        return brushToString(this.i.qc);
     }
     set columnOptionsToolTipBackgroundColor(v) {
-        this.i.p8 = stringToBrush(v);
+        this.i.qc = stringToBrush(v);
     }
     get columnOptionsHighlightColor() {
-        return brushToString(this.i.p3);
+        return brushToString(this.i.p7);
     }
     set columnOptionsHighlightColor(v) {
-        this.i.p3 = stringToBrush(v);
+        this.i.p7 = stringToBrush(v);
     }
     /**
      * Gets or sets the color of separators inside the column options menu.
     */
     get columnOptionsSeparatorColor() {
-        return brushToString(this.i.p6);
+        return brushToString(this.i.qa);
     }
     set columnOptionsSeparatorColor(v) {
-        this.i.p6 = stringToBrush(v);
+        this.i.qa = stringToBrush(v);
     }
     /**
      * Gets or sets the background color for group headers inside the column options menu.
     */
     get columnOptionsGroupHeaderBackground() {
-        return brushToString(this.i.p1);
+        return brushToString(this.i.p5);
     }
     set columnOptionsGroupHeaderBackground(v) {
-        this.i.p1 = stringToBrush(v);
+        this.i.p5 = stringToBrush(v);
     }
     /**
      * Gets or sets the text color for group headers inside the column options menu.
     */
     get columnOptionsGroupHeaderTextColor() {
-        return brushToString(this.i.p2);
+        return brushToString(this.i.p6);
     }
     set columnOptionsGroupHeaderTextColor(v) {
-        this.i.p2 = stringToBrush(v);
+        this.i.p6 = stringToBrush(v);
     }
     get columnOptionsGroupHeaderTextStyle() {
-        if (this.i.oj == null) {
+        if (this.i.on == null) {
             return null;
         }
-        return this.i.oj.fontString;
+        return this.i.on.fontString;
     }
     set columnOptionsGroupHeaderTextStyle(v) {
         let fi = new FontInfo();
         fi.fontString = v;
-        this.i.oj = fi;
+        this.i.on = fi;
     }
     get columnOptionsAccentColor() {
-        return brushToString(this.i.pz);
+        return brushToString(this.i.p3);
     }
     set columnOptionsAccentColor(v) {
-        this.i.pz = stringToBrush(v);
+        this.i.p3 = stringToBrush(v);
     }
     get columnOptionsRowHeight() {
-        return this.i.oy;
+        return this.i.o2;
     }
     set columnOptionsRowHeight(v) {
-        this.i.oy = +v;
+        this.i.o2 = +v;
     }
 }

package/esm5/lib/CanvasCellPresenterBase.js

@@ -29,18 +29,18 @@ export var CanvasCellPresenterBase = /** @class */ /*@__PURE__*/ (function (_sup
             this.a.cn(a.ez, a.e3, a.e1, a.ex);
         }
         if (a.a5) {
-            this.a.ch(a.nh, a.en, a.es, a.eq, a.el);
+            this.a.ch(a.nk, a.en, a.es, a.eq, a.el);
         }
         if (a.bs) {
-            this.a.ck(a.f9);
-            this.a.cu(a.h7);
+            this.a.ck(a.ga);
+            this.a.cu(a.h8);
         }
         if (a.a7) {
             if (a.bm && !this.a.z) {
                 this.a.b5();
             }
             if (a.bc(CellModel.ek)) {
-                this.a.cg(a.ng.color);
+                this.a.cg(a.nj.color);
             }
             if (a.bc(CellModel.ew)) {
                 this.a.cm(a.cq);

package/esm5/lib/CanvasContentCellModelHelper.js

@@ -25,7 +25,7 @@ export var CanvasContentCellModelHelper = /** @class */ /*@__PURE__*/ (function
     };
     CanvasContentCellModelHelper.a = function (a, b, c) {
         if (b.a7) {
-            if (b.bc(CellModel.fp) || b.bc(CellModel.eu) || b.bc(CellModel.h6) || b.bb("IsRowPinned") || b.bb("IsRowSticky") || b.bb("PinnedRowOpacity")) {
+            if (b.bc(CellModel.fp) || b.bc(CellModel.eu) || b.bc(CellModel.h7) || b.bb("IsRowPinned") || b.bb("IsRowSticky") || b.bb("PinnedRowOpacity")) {
                 var d = Math.min(1, Math.max(0, b.c7));
                 var e = b.cp * (1 - d);
                 c.ci(e);
@@ -34,14 +34,14 @@ export var CanvasContentCellModelHelper = /** @class */ /*@__PURE__*/ (function
                 }
             }
             if (b.bc(CellModel.e5)) {
-                CanvasContentCellModelHelper.c(c, b.ni);
+                CanvasContentCellModelHelper.c(c, b.nl);
                 if (b.bm) {
-                    c.cw(b.ni);
+                    c.cw(b.nl);
                 }
             }
-            if (b.bc(CellModel.gv)) {
+            if (b.bc(CellModel.gw)) {
             }
-            if (b.bc(CellModel.gb) || b.bc(CellModel.h5)) {
+            if (b.bc(CellModel.gc) || b.bc(CellModel.h6)) {
                 var f = b.g;
                 var g = b.i;
                 c.cl(f);

package/esm5/lib/CanvasDateTimeCellPresenter.js

@@ -29,22 +29,22 @@ export var CanvasDateTimeCellPresenter = /** @class */ /*@__PURE__*/ (function (
         _super.prototype.b.call(this, a);
         var b = a;
         if (a.a7) {
-            if (a.bc(DateTimeCellModel.oh) || a.bc(DateTimeCellModel.oi) || a.bc(DateTimeCellModel.og) || a.bc(DateTimeCellModel.gy) || a.bc(DateTimeCellModel.h4)) {
+            if (a.bc(DateTimeCellModel.ol) || a.bc(DateTimeCellModel.om) || a.bc(DateTimeCellModel.ok) || a.bc(DateTimeCellModel.gz) || a.bc(DateTimeCellModel.h5)) {
                 this.e(b);
-                this.d.cr(b.kz);
+                this.d.cr(b.k1);
             }
             CanvasContentCellModelHelper.a(this.a.bq, b, this.a);
         }
     };
     CanvasDateTimeCellPresenter.prototype.e = function (a) {
-        if (a.lw != null) {
-            a.kz = a.lw;
+        if (a.ly != null) {
+            a.k1 = a.ly;
             return;
         }
-        a.kz = a.ot(a.of);
-        if (a.kz == stringEmpty()) {
-            if (!(typeCast(Date_$type, a.ih) !== null)) {
-                a.kz = a.ih.toString();
+        a.k1 = a.ox(a.oj);
+        if (a.k1 == stringEmpty()) {
+            if (!(typeCast(Date_$type, a.ii) !== null)) {
+                a.k1 = a.ii.toString();
             }
         }
     };

package/esm5/lib/CanvasGridCellBase.js

@@ -631,8 +631,8 @@ export var CanvasGridCellBase = /** @class */ /*@__PURE__*/ (function (_super) {
         if (this.a1 != b) {
             this.a1 = b;
         }
-        var c = a.h7 * 0.2;
-        var d = a.f9 * 0.6;
+        var c = a.h8 * 0.2;
+        var d = a.ga * 0.6;
         if (this.a2 >= c && this.a2 <= d) {
             return;
         }

package/esm5/lib/CanvasImageCellPresenter.js

@@ -29,23 +29,23 @@ export var CanvasImageCellPresenter = /** @class */ /*@__PURE__*/ (function (_su
         _super.prototype.b.call(this, a);
         var b = a;
         if (a.a7) {
-            if (a.bc(CellModel.fp) || a.bc(CellModel.h6)) {
+            if (a.bc(CellModel.fp) || a.bc(CellModel.h7)) {
                 var c = Math.min(1, Math.max(0, a.c7));
                 var d = a.cs * (1 - c);
                 this.d.dd = d;
             }
-            if (b.bc(ImageCellModel.n9) || b.bc(ImageCellModel.oa)) {
-                this.e(b.od, b.n6);
+            if (b.bc(ImageCellModel.od) || b.bc(ImageCellModel.oe)) {
+                this.e(b.oh, b.oa);
             }
-            if (b.bc(ImageCellModel.ob) || b.bc(ImageCellModel.gb) || b.bc(ImageCellModel.h5)) {
-                this.f(b.n8, b.g, b.i);
+            if (b.bc(ImageCellModel.of) || b.bc(ImageCellModel.gc) || b.bc(ImageCellModel.h6)) {
+                this.f(b.oc, b.g, b.i);
             }
-            if (b.bc(ImageCellModel.hm)) {
+            if (b.bc(ImageCellModel.hn)) {
                 if (a.u == 1) {
                     this.d.dg();
                 }
                 else if (a.u == 2) {
-                    this.e(b.od, b.n6);
+                    this.e(b.oh, b.oa);
                 }
             }
         }

package/esm5/lib/CanvasNumericCellPresenter.js

@@ -29,20 +29,20 @@ export var CanvasNumericCellPresenter = /** @class */ /*@__PURE__*/ (function (_
         _super.prototype.b.call(this, a);
         var b = a;
         if (a.a7) {
-            if (a.bc(NumericCellModel.ou) || a.bc(NumericCellModel.oi) || a.bc(NumericCellModel.h4) || b.ob()) {
-                b.kz = this.e(b);
-                this.d.cr(b.kz);
+            if (a.bc(NumericCellModel.o1) || a.bc(NumericCellModel.oo) || a.bc(NumericCellModel.h5) || b.og()) {
+                b.k1 = this.e(b);
+                this.d.cr(b.k1);
             }
             CanvasContentCellModelHelper.a(this.a.bq, b, this.a);
         }
     };
     CanvasNumericCellPresenter.prototype.e = function (a) {
-        if (a.lw != null) {
-            return a.lw;
+        if (a.ly != null) {
+            return a.ly;
         }
-        if (a.o0 != null) {
-            var val_ = a.oe;
-            var override_ = a.o0;
+        if (a.o7 != null) {
+            var val_ = a.ok;
+            var override_ = a.o7;
             return (override_.format(val_));
         }
         return NumericCellFormatter.c(a);

package/esm5/lib/CanvasSectionHeaderCellPresenter.js

@@ -28,24 +28,24 @@ export var CanvasSectionHeaderCellPresenter = /** @class */ /*@__PURE__*/ (funct
         _super.prototype.b.call(this, a);
         var b = a;
         if (a.a7) {
-            if (a.bc(SectionHeaderCellModel.ob) || a.bc(SectionHeaderCellModel.od)) {
-                if (b.n7 == null || (b.n7.length == 0 && b.ol == null)) {
-                    if (b.ih == null) {
-                        b.kz = "";
+            if (a.bc(SectionHeaderCellModel.of) || a.bc(SectionHeaderCellModel.oh)) {
+                if (b.ob == null || (b.ob.length == 0 && b.op == null)) {
+                    if (b.ii == null) {
+                        b.k1 = "";
                     }
                     else {
-                        b.kz = b.ih.toString();
+                        b.k1 = b.ii.toString();
                     }
                 }
                 else {
-                    if (b.oj != null && b.oa == 0) {
-                        b.kz = b.ol + "    " + b.oj;
+                    if (b.on != null && b.oe == 0) {
+                        b.k1 = b.op + "    " + b.on;
                     }
                     else {
-                        b.kz = b.ol;
+                        b.k1 = b.op;
                     }
                 }
-                this.d.cr(b.kz);
+                this.d.cr(b.k1);
             }
             CanvasContentCellModelHelper.a(this.a.bq, b, this.a);
         }

package/esm5/lib/CanvasSummaryCellPresenter.js

@@ -27,18 +27,18 @@ export var CanvasSummaryCellPresenter = /** @class */ /*@__PURE__*/ (function (_
         _super.prototype.b.call(this, a);
         var b = a;
         if (a.a7) {
+            CanvasContentCellModelHelper.a(this.a.bq, b, this.a);
             if (a.bb("ResolvedSummaryLabel") || a.bb("ResolvedSummaryValue")) {
-                this.d.dj(b.od);
-                this.d.cr(b.of);
+                this.d.dj(b.oh);
+                this.d.cr(b.oj);
             }
             if (a.bb("SummaryLabelTextColor")) {
-                var c = CanvasContentCellModelHelper.e(b.ok);
+                var c = CanvasContentCellModelHelper.e(b.oo);
                 this.d.dk(c);
             }
-            if (a.bb("FontInfo")) {
-                this.d.dl(b.aj);
+            if (a.bb("FontInfo") || a.bb("SummaryLabelFontInfo")) {
+                this.d.dl(b.oa);
             }
-            CanvasContentCellModelHelper.a(this.a.bq, b, this.a);
         }
     };
     CanvasSummaryCellPresenter.$t = markType(CanvasSummaryCellPresenter, 'CanvasSummaryCellPresenter', CanvasCellPresenterBase.$);

package/esm5/lib/CanvasTemplateCellPresenter.js

@@ -30,13 +30,13 @@ export var CanvasTemplateCellPresenter = /** @class */ /*@__PURE__*/ (function (
         _super.prototype.b.call(this, a);
         var b = a;
         var c = this.e.actualColumns._inner[a.l.a5];
-        if (a.bc(CellModel.fp) || a.bc(CellModel.h6)) {
+        if (a.bc(CellModel.fp) || a.bc(CellModel.h7)) {
             var d = Math.min(1, Math.max(0, a.c7));
             var e = a.cs * (1 - d);
             this.d.db.opacity = e;
         }
         this.d.dc();
-        c.r5(a, this.d);
+        c.r8(a, this.d);
     };
     CanvasTemplateCellPresenter.$t = markType(CanvasTemplateCellPresenter, 'CanvasTemplateCellPresenter', CanvasCellPresenterBase.$);
     return CanvasTemplateCellPresenter;

package/esm5/lib/CanvasTemplateHeaderCellPresenter.js

@@ -30,7 +30,7 @@ export var CanvasTemplateHeaderCellPresenter = /** @class */ /*@__PURE__*/ (func
         _super.prototype.b.call(this, a);
         var b = this.e.actualColumns._inner[a.l.a5];
         var c = b.header;
-        if (a.bc(CellModel.fp) || a.bc(CellModel.h6)) {
+        if (a.bc(CellModel.fp) || a.bc(CellModel.h7)) {
             var d = Math.min(1, Math.max(0, a.c7));
             var e = a.cs * (1 - d);
         }

package/esm5/lib/CanvasTextCellPresenter.js

@@ -28,26 +28,26 @@ export var CanvasTextCellPresenter = /** @class */ /*@__PURE__*/ (function (_sup
         _super.prototype.b.call(this, a);
         var b = a;
         if (a.a7) {
-            if (a.bc(TextCellModel.n5) || a.bc(TextCellModel.h4) || a.bc(TextCellModel.gy)) {
-                b.kz = this.e(b);
-                this.d.cr(b.kz);
+            if (a.bc(TextCellModel.n9) || a.bc(TextCellModel.h5) || a.bc(TextCellModel.gz)) {
+                b.k1 = this.e(b);
+                this.d.cr(b.k1);
             }
             CanvasContentCellModelHelper.a(this.a.bq, b, this.a);
         }
     };
     CanvasTextCellPresenter.prototype.e = function (a) {
-        if (a.lw != null) {
-            return a.lw;
+        if (a.ly != null) {
+            return a.ly;
         }
-        if (a.n7 != null) {
-            return a.n7;
+        if (a.ob != null) {
+            return a.ob;
         }
         else {
-            if (a.ih == null) {
+            if (a.ii == null) {
                 return "";
             }
             else {
-                return a.ih.toString();
+                return a.ii.toString();
             }
         }
     };

package/esm5/lib/CanvasTextHeaderCellPresenter.js

@@ -36,11 +36,11 @@ export var CanvasTextHeaderCellPresenter = /** @class */ /*@__PURE__*/ (function
         _super.prototype.b.call(this, a);
         var b = a;
         if (a.a7) {
-            if (a.bc(TextCellModel.n5)) {
-                b.kz = b.n7;
-                this.d.cr(b.kz);
+            if (a.bc(TextCellModel.n9)) {
+                b.k1 = b.ob;
+                this.d.cr(b.k1);
             }
-            if (a.bc(CellModel.hk)) {
+            if (a.bc(CellModel.hl)) {
                 if (a.bt) {
                     this.d.db.m = false;
                 }
@@ -54,17 +54,17 @@ export var CanvasTextHeaderCellPresenter = /** @class */ /*@__PURE__*/ (function
                     this.d.db.m = true;
                 }
             }
-            if (a.bc(CellModel.hl)) {
+            if (a.bc(CellModel.hm)) {
                 if (a.bt) {
                     this.d.db.m = false;
                 }
-                this.d.db.a3 = a.nx;
+                this.d.db.a3 = a.n1;
                 if (a.bt) {
                     this.d.db.m = true;
                 }
             }
             if (a.bb("SortIndicatorStyle")) {
-                this.d.db.f = b.oe;
+                this.d.db.f = b.oi;
             }
             CanvasContentCellModelHelper.a(this.a.bq, b, this.a);
         }

package/esm5/lib/CellPresenterBase.js

@@ -25,86 +25,89 @@ export var CellPresenterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         this.b(a);
     };
     CellPresenterBase.prototype.b = function (a) {
-        this.a.cv(a.c);
-        this.a.c4(a.e);
-        this.a.cy(a.d);
-        this.a.cj();
-        if (a.bc(CellModel.gn)) {
+        this.a.cw(a.c);
+        this.a.c5(a.e);
+        this.a.cz(a.d);
+        this.a.ck();
+        if (a.bc(CellModel.go)) {
             this.a.ad = a.bh;
         }
         if (a.bc(CellModel.e0) || a.bc(CellModel.e4) || a.bc(CellModel.e2) || a.bc(CellModel.ey)) {
-            this.a.c6(a.ez, a.e3, a.e1, a.ex);
+            this.a.c7(a.ez, a.e3, a.e1, a.ex);
         }
         if (a.a5) {
-            this.a.cx(a.nh, a.en, a.es, a.eq, a.el);
+            this.a.cy(a.nk, a.en, a.es, a.eq, a.el);
             if (a.bc(CellModel.ej)) {
                 if (!a.bj && a.p.i8 && a.bg && a.co == 1) {
-                    this.a.b9();
+                    this.a.ca();
                 }
             }
         }
         if (a.bs) {
-            this.a.c1(a.f9, (a.e3 + a.ex + a.es + a.el));
-            this.a.dc(a.h7, (a.ez + a.e1 + a.en + a.eq));
+            this.a.c2(a.ga, (a.e3 + a.ex + a.es + a.el));
+            this.a.dd(a.h8, (a.ez + a.e1 + a.en + a.eq));
         }
         if (a.a7) {
             if (a.bm && !this.a.z) {
-                this.a.b8();
+                this.a.b9();
             }
             if (a.bc(CellModel.ek)) {
-                this.a.cw(a.ng.color);
+                this.a.cx(a.nj.color);
             }
             if (a.bc(CellModel.ew)) {
-                this.a.c5(a.cq);
+                this.a.c6(a.cq);
             }
             if (a.bb("IsCollapsable")) {
                 this.a.aa = a.a6;
-                this.a.bi = a.gf;
+                this.a.bi = a.gg;
                 this.a.ab = a.be;
-                this.a.dc(a.h7, (a.ez + a.e1 + a.en + a.eq));
+                this.a.dd(a.h8, (a.ez + a.e1 + a.en + a.eq));
             }
             if (a.bb("Indent")) {
-                this.a.bi = a.gf;
-                this.a.dc(a.h7, (a.ez + a.e1 + a.en + a.eq));
+                this.a.bi = a.gg;
+                this.a.dd(a.h8, (a.ez + a.e1 + a.en + a.eq));
             }
             if (a.bb("IsExpanded")) {
                 this.a.ab = a.be;
             }
-            if (a.bc(CellModel.hz)) {
-                this.a.b3 = a.ln;
+            if (a.bb("IsCollapsable") || a.bb("ExpansionIndicatorIconColor")) {
+                this.a.dt = a.ns;
             }
-            if (a.bc(CellModel.hx)) {
-                this.a.dt = a.n1;
+            if (a.bc(CellModel.h0)) {
+                this.a.b4 = a.lp;
             }
             if (a.bc(CellModel.hy)) {
-                this.a.n = a.ak;
+                this.a.dw = a.n5;
             }
-            if (a.bc(CellModel.hq)) {
-                this.a.by = a.lf;
-            }
-            if (a.bc(CellModel.ho)) {
-                this.a.bv = a.lc;
+            if (a.bc(CellModel.hz)) {
+                this.a.n = a.ak;
             }
             if (a.bc(CellModel.hr)) {
-                this.a.ds = a.n0;
+                this.a.bz = a.lh;
             }
             if (a.bc(CellModel.hp)) {
-                this.a.dr = a.nz;
+                this.a.bw = a.le;
+            }
+            if (a.bc(CellModel.hs)) {
+                this.a.dv = a.n4;
+            }
+            if (a.bc(CellModel.hq)) {
+                this.a.du = a.n3;
             }
-            if (a.bc(CellModel.hw)) {
+            if (a.bc(CellModel.hx)) {
                 this.a.aj = a.c4;
             }
-            if (a.bc(CellModel.ht) || a.bc(CellModel.hu) || a.bc(CellModel.hv) || a.bc(CellModel.hv)) {
-                this.a.dv = new Rect(0, a.c1, a.c2, a.c3, a.c0);
+            if (a.bc(CellModel.hu) || a.bc(CellModel.hv) || a.bc(CellModel.hw) || a.bc(CellModel.hw)) {
+                this.a.dy = new Rect(0, a.c1, a.c2, a.c3, a.c0);
             }
         }
         if (a.bs && a.bm) {
-            this.a.dk(a);
+            this.a.dl(a);
         }
         if (a.bb("DoClone")) {
             if (a.a1) {
                 a.a1 = false;
-                this.a.b7();
+                this.a.b8();
             }
         }
     };