igniteui-angular-data-grids 20.0.0-beta.1 → 20.0.1-beta.0

package/esm5/lib/GridSortIndicatorView_combined.js

@@ -18,6 +18,7 @@ import { CanvasViewRenderer } from "igniteui-angular-core";
 import { GridStyleRepository } from "./GridStyleRepository";
 import { truncate, isNaN_ } from "igniteui-angular-core";
 import { ColumnSortDirection_$type } from "./ColumnSortDirection";
+import { NativeUI } from "igniteui-angular-core";
 import { EasingFunctions } from "igniteui-angular-core";
 import { PathFigure } from "igniteui-angular-core";
 import { LineSegment } from "igniteui-angular-core";
@@ -97,12 +98,12 @@ var GridSortIndicatorView = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         this.c.l(0, 0, this.k, this.j);
         this.c.aa();
-        this.c.ab(this.a.v(), this.a.v());
+        this.c.ab(this.a.x(), this.a.x());
         for (var c = 0; c < this.d.count; c++) {
             this.c.k(this.d._inner[c].j);
             var d = this.y();
-            if (this.a.a0 != null) {
-                d = this.a.a0;
+            if (this.a.a3 != null) {
+                d = this.a.a3;
             }
             this.d._inner[c]._stroke = d;
             this.c.t(this.d._inner[c]);
@@ -111,20 +112,20 @@ var GridSortIndicatorView = /** @class */ /*@__PURE__*/ (function (_super) {
         if (this.c.d && this.g != 1) {
             this.c.z();
         }
-        this.a.at();
+        this.a.aw();
     };
     GridSortIndicatorView.prototype.u = function () {
         this.t();
     };
     GridSortIndicatorView.prototype.n = function () {
-        this.a.an(this.k, this.j, this.d);
+        this.a.aq(this.k, this.j, this.d);
     };
     GridSortIndicatorView.prototype.v = function () {
         var _this = this;
         if (this.d.count != 1) {
             return;
         }
-        this.d._inner[0]._opacity = this.a.r;
+        this.d._inner[0]._opacity = this.a.t;
         var a = { $type: Point_$type, x: this.k / 2, y: this.j / 2 };
         var b = new TransformGroup();
         b.j.add(((function () {
@@ -135,7 +136,7 @@ var GridSortIndicatorView = /** @class */ /*@__PURE__*/ (function (_super) {
         })()));
         b.j.add(((function () {
             var $ret = new RotateTransform();
-            $ret.j = _this.a.q;
+            $ret.j = _this.a.s;
             return $ret;
         })()));
         b.j.add(((function () {
@@ -147,23 +148,23 @@ var GridSortIndicatorView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.d._inner[0].j = b;
     };
     GridSortIndicatorView.prototype.o = function () {
-        this.a.ao(this.k, this.j, this.d);
+        this.a.ar(this.k, this.j, this.d);
     };
     GridSortIndicatorView.prototype.w = function () {
         if (this.d.count != 4) {
             return;
         }
-        this.d._inner[0]._opacity = this.a.r;
-        this.d._inner[1]._opacity = this.a.r;
-        this.d._inner[2]._opacity = this.a.x;
-        this.d._inner[3]._opacity = this.a.x;
+        this.d._inner[0]._opacity = this.a.t;
+        this.d._inner[1]._opacity = this.a.t;
+        this.d._inner[2]._opacity = this.a.z;
+        this.d._inner[3]._opacity = this.a.z;
     };
     GridSortIndicatorView.prototype.p = function () {
-        this.a.ap(this.k, this.j, this.d);
+        this.a.as(this.k, this.j, this.d);
     };
     GridSortIndicatorView.prototype.x = function () {
-        this.d._inner[0]._opacity = this.a.r;
-        this.d._inner[1]._opacity = this.a.x;
+        this.d._inner[0]._opacity = this.a.t;
+        this.d._inner[1]._opacity = this.a.z;
     };
     GridSortIndicatorView.prototype.r = function (a) {
         if (a == null) {
@@ -172,7 +173,7 @@ var GridSortIndicatorView = /** @class */ /*@__PURE__*/ (function (_super) {
             this.c = null;
             return;
         }
-        this.g = (isNaN_(this.a.w) ? this.a.p : this.a.w);
+        this.g = (isNaN_(this.a.y) ? this.a.r : this.a.y);
         var b = a;
         this.l = b;
         this.a.j.u(this.l);
@@ -198,26 +199,26 @@ var GridSortIndicatorView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.m = h;
         var i = this.l.get2DCanvasContext(this.m);
         this.c = new RenderingContext(new CanvasViewRenderer(), i);
-        if (isNaN_(this.a.w)) {
-            this.a.p = window.devicePixelRatio;
-            this.g = this.a.p;
+        if (isNaN_(this.a.y)) {
+            this.a.r = window.devicePixelRatio;
+            this.g = this.a.r;
         }
         this.t();
     };
     GridSortIndicatorView.prototype.s = function (a, b) {
-        if (isNaN_(this.a.w)) {
-            this.a.p = window.devicePixelRatio;
-            this.g = this.a.p;
+        if (isNaN_(this.a.y)) {
+            this.a.r = window.devicePixelRatio;
+            this.g = this.a.r;
         }
         this.k = a;
         this.j = b;
         this.t();
     };
     GridSortIndicatorView.prototype.q = function () {
-        if (isNaN_(this.a.w)) {
-            this.a.p = window.devicePixelRatio;
-            if (this.g != this.a.p) {
-                this.g = this.a.p;
+        if (isNaN_(this.a.y)) {
+            this.a.r = window.devicePixelRatio;
+            if (this.g != this.a.r) {
+                this.g = this.a.r;
                 this.t();
             }
         }
@@ -236,47 +237,48 @@ var GridSortIndicator = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(GridSortIndicator, _super);
     function GridSortIndicator() {
         var _this = _super.call(this) || this;
-        _this.ab = null;
+        _this.ad = null;
         _this.a = 0;
-        _this.az = null;
+        _this.a2 = null;
         _this.k = true;
         _this.propertyChanged = null;
         _this.g = null;
         _this.h = null;
-        _this.o = NaN;
-        _this.m = 1;
+        _this.q = NaN;
+        _this.o = 1;
         _this.e = 0;
-        _this.n = 0;
-        _this.q = 0;
-        _this.x = 0;
-        _this.t = 0;
+        _this.l = false;
+        _this.p = 0;
         _this.s = 0;
         _this.z = 0;
-        _this.y = 0;
+        _this.v = 0;
         _this.u = 0;
+        _this.ab = 0;
         _this.aa = 0;
+        _this.w = 0;
+        _this.ac = 0;
         _this.c = null;
         _this.renderCompleted = null;
-        _this.r = 0;
-        _this.x = 0.5;
-        _this.q = 180;
+        _this.t = 0;
+        _this.z = 0.5;
+        _this.s = 180;
         _this.c = new GridSortIndicatorView(_this);
         _this.g = new DoubleAnimator(0, 1, 400);
         _this.h = new DoubleAnimator(0, 1, 400);
         _this.g.b = EasingFunctions.cubicEase;
         _this.h.b = EasingFunctions.cubicEase;
         var a = _this.g;
-        a.propertyChanged = delegateCombine(a.propertyChanged, runOn(_this, _this.al));
+        a.propertyChanged = delegateCombine(a.propertyChanged, runOn(_this, _this.ao));
         var b = _this.h;
-        b.propertyChanged = delegateCombine(b.propertyChanged, runOn(_this, _this.am));
+        b.propertyChanged = delegateCombine(b.propertyChanged, runOn(_this, _this.ap));
         return _this;
     }
-    Object.defineProperty(GridSortIndicator.prototype, "ac", {
+    Object.defineProperty(GridSortIndicator.prototype, "ae", {
         get: function () {
-            return this.ab;
+            return this.ad;
         },
         set: function (a) {
-            this.ab = a;
+            this.ad = a;
         },
         enumerable: false,
         configurable: true
@@ -289,27 +291,27 @@ var GridSortIndicator = /** @class */ /*@__PURE__*/ (function (_super) {
             var b = this.a;
             this.a = a;
             if (b != this.a) {
-                this.as("SortDirection", enumGetBox(ColumnSortDirection_$type, b), enumGetBox(ColumnSortDirection_$type, this.a));
+                this.av("SortDirection", enumGetBox(ColumnSortDirection_$type, b), enumGetBox(ColumnSortDirection_$type, this.a));
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(GridSortIndicator.prototype, "a0", {
+    Object.defineProperty(GridSortIndicator.prototype, "a3", {
         get: function () {
-            return this.az;
+            return this.a2;
         },
         set: function (a) {
-            var b = this.az;
-            this.az = a;
-            if (b != this.az) {
-                this.as("IconColor", b, this.az);
+            var b = this.a2;
+            this.a2 = a;
+            if (b != this.a2) {
+                this.av("IconColor", b, this.a2);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(GridSortIndicator.prototype, "l", {
+    Object.defineProperty(GridSortIndicator.prototype, "m", {
         get: function () {
             return this.k;
         },
@@ -317,7 +319,7 @@ var GridSortIndicator = /** @class */ /*@__PURE__*/ (function (_super) {
             var b = this.k;
             this.k = a;
             if (b != this.k) {
-                this.as("IsAnimationEnabled", b, this.k);
+                this.av("IsAnimationEnabled", b, this.k);
             }
         },
         enumerable: false,
@@ -337,26 +339,26 @@ var GridSortIndicator = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(GridSortIndicator.prototype, "w", {
+    Object.defineProperty(GridSortIndicator.prototype, "y", {
         get: function () {
-            return this.o;
+            return this.q;
         },
         set: function (a) {
-            var b = this.o;
-            this.o = a;
-            this.as("PixelScalingRatio", b, this.o);
+            var b = this.q;
+            this.q = a;
+            this.av("PixelScalingRatio", b, this.q);
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(GridSortIndicator.prototype, "p", {
+    Object.defineProperty(GridSortIndicator.prototype, "r", {
         get: function () {
-            return this.m;
+            return this.o;
         },
         set: function (a) {
-            var b = this.m;
-            this.m = a;
-            this.as("ActualPixelScalingRatio", b, this.m);
+            var b = this.o;
+            this.o = a;
+            this.av("ActualPixelScalingRatio", b, this.o);
         },
         enumerable: false,
         configurable: true
@@ -369,36 +371,50 @@ var GridSortIndicator = /** @class */ /*@__PURE__*/ (function (_super) {
             var b = this.e;
             this.e = a;
             if (b != this.e) {
-                this.as("SortIndicatorStyle", enumGetBox(SortIndicatorStyle_$type, b), enumGetBox(SortIndicatorStyle_$type, this.e));
+                this.av("SortIndicatorStyle", enumGetBox(SortIndicatorStyle_$type, b), enumGetBox(SortIndicatorStyle_$type, this.e));
             }
         },
         enumerable: false,
         configurable: true
     });
-    GridSortIndicator.prototype.as = function (a, b, c) {
-        this.aw(a, b, c);
+    Object.defineProperty(GridSortIndicator.prototype, "n", {
+        get: function () {
+            return this.l;
+        },
+        set: function (a) {
+            var b = this.l;
+            this.l = a;
+            if (b != this.l) {
+                this.av("IsHitTestVisible", b, this.l);
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    GridSortIndicator.prototype.av = function (a, b, c) {
+        this.az(a, b, c);
         if (this.propertyChanged != null) {
             this.propertyChanged(this, new PropertyChangedEventArgs(a));
         }
     };
-    Object.defineProperty(GridSortIndicator.prototype, "r", {
+    Object.defineProperty(GridSortIndicator.prototype, "t", {
         get: function () {
-            return this.n;
+            return this.p;
         },
         set: function (a) {
-            var b = this.n;
-            this.n = a;
+            var b = this.p;
+            this.p = a;
             if (b != a) {
-                this.as("CurrentOpacity", b, a);
+                this.av("CurrentOpacity", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    GridSortIndicator.prototype.aw = function (a, b, c) {
+    GridSortIndicator.prototype.az = function (a, b, c) {
         switch (a) {
             case "PixelScalingRatio":
-                this.p = this.w;
+                this.r = this.y;
                 break;
             case "ActualPixelScalingRatio":
                 this.c.u();
@@ -409,62 +425,65 @@ var GridSortIndicator = /** @class */ /*@__PURE__*/ (function (_super) {
             case "SortIndicatorStyle":
                 switch (this.f) {
                     case 0:
-                        this.au(this.b, false);
+                        this.ax(this.b, false);
                         break;
                     case 1:
                     case 2:
-                        this.av(this.b, false);
+                        this.ay(this.b, false);
                         break;
                 }
                 break;
             case "SortDirection":
                 switch (this.f) {
                     case 0:
-                        this.au(EnumUtil.getEnumValue(ColumnSortDirection_$type, c), this.l);
+                        this.ax(EnumUtil.getEnumValue(ColumnSortDirection_$type, c), this.m);
                         break;
                     case 1:
                     case 2:
-                        this.av(EnumUtil.getEnumValue(ColumnSortDirection_$type, c), this.l);
+                        this.ay(EnumUtil.getEnumValue(ColumnSortDirection_$type, c), this.m);
                         break;
                 }
                 break;
+            case "IsHitTestVisible":
+                NativeUI.u(this.c.m, this.n);
+                break;
         }
     };
-    GridSortIndicator.prototype.am = function (a, b) {
+    GridSortIndicator.prototype.ap = function (a, b) {
         switch (this.f) {
             case 0:
-                this.r = this.t + this.h.o * (this.z - this.t);
+                this.t = this.v + this.h.o * (this.ab - this.v);
                 break;
             case 1:
             case 2:
-                this.r = this.t + this.h.o * (this.z - this.t);
-                this.x = this.u + this.h.o * (this.aa - this.u);
+                this.t = this.v + this.h.o * (this.ab - this.v);
+                this.z = this.w + this.h.o * (this.ac - this.w);
                 break;
         }
         this.c.u();
     };
-    GridSortIndicator.prototype.al = function (a, b) {
-        this.q = this.s + this.g.o * (this.y - this.s);
+    GridSortIndicator.prototype.ao = function (a, b) {
+        this.s = this.u + this.g.o * (this.aa - this.u);
         this.c.u();
     };
-    GridSortIndicator.prototype.au = function (a, b) {
-        this.t = this.r;
-        this.s = this.q;
-        if (this.l || this.g.f() || this.h.f()) {
+    GridSortIndicator.prototype.ax = function (a, b) {
+        this.v = this.t;
+        this.u = this.s;
+        if (this.m || this.g.f() || this.h.f()) {
             this.g.w();
             this.h.w();
         }
         if (a == 0) {
-            this.z = 0;
-            this.y = 180;
+            this.ab = 0;
+            this.aa = 180;
         }
         else {
-            this.z = 1;
+            this.ab = 1;
             if (a == 1) {
-                this.y = 180;
+                this.aa = 180;
             }
             else {
-                this.y = 0;
+                this.aa = 0;
             }
         }
         if (b) {
@@ -472,41 +491,41 @@ var GridSortIndicator = /** @class */ /*@__PURE__*/ (function (_super) {
             this.h.v();
         }
         else {
-            this.q = this.y;
-            this.r = this.z;
+            this.s = this.aa;
+            this.t = this.ab;
             this.c.u();
         }
     };
-    GridSortIndicator.prototype.av = function (a, b) {
-        this.t = this.r;
-        this.u = this.x;
-        if (this.l || this.h.f()) {
+    GridSortIndicator.prototype.ay = function (a, b) {
+        this.v = this.t;
+        this.w = this.z;
+        if (this.m || this.h.f()) {
             this.h.w();
         }
         switch (a) {
             case 0:
-                this.z = 0.4;
-                this.aa = 0.4;
+                this.ab = 0.4;
+                this.ac = 0.4;
                 break;
             case 1:
-                this.z = 1;
-                this.aa = 0.2;
+                this.ab = 1;
+                this.ac = 0.2;
                 break;
             case 2:
-                this.z = 0.2;
-                this.aa = 1;
+                this.ab = 0.2;
+                this.ac = 1;
                 break;
         }
         if (b) {
             this.h.v();
         }
         else {
-            this.r = this.z;
-            this.x = this.aa;
+            this.t = this.ab;
+            this.z = this.ac;
             this.c.u();
         }
     };
-    GridSortIndicator.prototype.v = function () {
+    GridSortIndicator.prototype.x = function () {
         switch (this.f) {
             case 0: return 1;
             case 1: return 0.71;
@@ -514,23 +533,24 @@ var GridSortIndicator = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return 1;
     };
-    GridSortIndicator.prototype.ax = function (a) {
+    GridSortIndicator.prototype.a0 = function (a) {
         this.c.r(a);
+        NativeUI.u(this.c.m, this.n);
     };
-    GridSortIndicator.prototype.ay = function (a) {
+    GridSortIndicator.prototype.a1 = function (a) {
         this.j.u(a);
         this.i.u(a);
     };
-    GridSortIndicator.prototype.ad = function () {
+    GridSortIndicator.prototype.af = function () {
         return this.c.m.getNativeElement();
     };
-    GridSortIndicator.prototype.ar = function (a, b) {
+    GridSortIndicator.prototype.au = function (a, b) {
         this.c.s(a, b);
     };
-    GridSortIndicator.prototype.aq = function () {
+    GridSortIndicator.prototype.at = function () {
         this.c.q();
     };
-    GridSortIndicator.prototype.an = function (a, b, c) {
+    GridSortIndicator.prototype.aq = function (a, b, c) {
         var d = Math.min(a, b);
         var e = { $type: Point_$type, x: a / 2, y: b / 2 };
         var f = d * 0.5;
@@ -560,7 +580,7 @@ var GridSortIndicator = /** @class */ /*@__PURE__*/ (function (_super) {
         p.am = 2;
         c.add(p);
     };
-    GridSortIndicator.prototype.ao = function (a, b, c) {
+    GridSortIndicator.prototype.ar = function (a, b, c) {
         var _this = this;
         var d = Geometry.a("M3.792172, 7.800278 L7.983785, 3.635676 L12.148387, 7.800278L12.148387, 7.800278");
         var e = Geometry.a("M7.97027972,4.10930186 L7.97027972,13.8116223 L7.97027972,4.10930186 Z");
@@ -599,7 +619,7 @@ var GridSortIndicator = /** @class */ /*@__PURE__*/ (function (_super) {
             return $ret;
         })()));
     };
-    GridSortIndicator.prototype.ap = function (a, b, c) {
+    GridSortIndicator.prototype.as = function (a, b, c) {
         var _this = this;
         var d = { $type: Point_$type, x: a / 2, y: b / 2 };
         var e = { $type: Point_$type, x: d.x - 3.5, y: d.y - 1.5 };
@@ -623,7 +643,7 @@ var GridSortIndicator = /** @class */ /*@__PURE__*/ (function (_super) {
             return $ret;
         })()));
     };
-    GridSortIndicator.prototype.at = function () {
+    GridSortIndicator.prototype.aw = function () {
         if (this.renderCompleted != null) {
             this.renderCompleted(this, new SortIndicatorRenderCompletedEventArgs());
         }

package/esm5/lib/ISummaryChooserView_combined.js

@@ -90,8 +90,8 @@ var SummaryChooserView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.e();
     };
     SummaryChooserView.prototype.e = function () {
-        if (this.model.f.bc > -1) {
-            var a = this.model.r.count * this.model.f.bc;
+        if (this.model.f.bf > -1) {
+            var a = this.model.r.count * this.model.f.bf;
             a += 4;
             this.d.setStyleProperty("height", a + "px");
         }
@@ -395,12 +395,12 @@ var SummaryChooser = /** @class */ /*@__PURE__*/ (function (_super) {
     SummaryChooser.prototype.a6 = function () {
         if (this.e != null) {
             this.e.density = this.m;
-            this.e.e7 = this.ba;
+            this.e.fe = this.ba;
             this.e.baseTheme = this.i;
             this.e.backgroundColor = this.a9;
             this.e.showSelectAll = false;
-            this.e.a3 = false;
-            this.e.az = false;
+            this.e.a6 = false;
+            this.e.a2 = false;
             this.e.updateHrMargin(new Thickness(1, -7, 3, -7, 3));
             this.e.itemsSource = this.q;
             this.e.dataMemberPath = "label";
@@ -454,7 +454,7 @@ var SummaryChooser = /** @class */ /*@__PURE__*/ (function (_super) {
             if (d.iD == a) {
                 d.isSelected = b;
                 if (this.e != null) {
-                    this.e.dg(c, d, d);
+                    this.e.dl(c, d, d);
                 }
                 break;
             }
@@ -466,7 +466,7 @@ var SummaryChooser = /** @class */ /*@__PURE__*/ (function (_super) {
         c.label = b;
         this.q.add(c);
         if (this.e != null) {
-            this.e.dd(this.q.count - 1, c);
+            this.e.di(this.q.count - 1, c);
         }
         this.c.onItemInserted();
     };
@@ -476,7 +476,7 @@ var SummaryChooser = /** @class */ /*@__PURE__*/ (function (_super) {
             if (c.iD == a) {
                 this.q.removeAt(b);
                 if (this.e != null) {
-                    this.e.df(b, c);
+                    this.e.dk(b, c);
                 }
                 break;
             }
@@ -489,7 +489,7 @@ var SummaryChooser = /** @class */ /*@__PURE__*/ (function (_super) {
             if (d.iD == a) {
                 d.label = b;
                 if (this.e != null) {
-                    this.e.dg(c, d, d);
+                    this.e.dl(c, d, d);
                 }
                 break;
             }

package/esm5/lib/ImageCellPresenter.js

@@ -29,23 +29,23 @@ var ImageCellPresenter = /** @class */ /*@__PURE__*/ (function (_super) {
         _super.prototype.b.call(this, a);
         var b = a;
         if (a.a3) {
-            if (a.a8(CellModel.fa) || a.a8(CellModel.hc)) {
+            if (a.a8(CellModel.fa) || a.a8(CellModel.hd)) {
                 var c = Math.min(1, Math.max(0, a.ct));
                 var d = a.cj * (1 - c);
                 this.d.co = d;
             }
-            if (b.a8(ImageCellModel.mj) || b.a8(ImageCellModel.mk)) {
-                this.e(b.mn, b.mg);
+            if (b.a8(ImageCellModel.mn) || b.a8(ImageCellModel.mo)) {
+                this.e(b.mr, b.mk);
             }
-            if (b.a8(ImageCellModel.ml) || b.a8(ImageCellModel.fw) || b.a8(ImageCellModel.hb)) {
-                this.f(b.mi, b.g, b.i);
+            if (b.a8(ImageCellModel.mp) || b.a8(ImageCellModel.fw) || b.a8(ImageCellModel.hc)) {
+                this.f(b.mm, b.g, b.i);
             }
             if (b.a8(ImageCellModel.g6)) {
                 if (a.u == 1) {
                     this.d.ct();
                 }
                 else if (a.u == 2) {
-                    this.e(b.mn, b.mg);
+                    this.e(b.mr, b.mk);
                 }
             }
         }

package/esm5/lib/MultiColumnComboBoxView_combined.js

@@ -712,7 +712,7 @@ var MultiColumnComboBoxView = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             var f = this.g;
             var g = this.g.p();
-            e = g.lt();
+            e = g.lu();
         }
         d.d = e;
         d.b = a;
@@ -2776,7 +2776,7 @@ var MultiColumnComboBox = /** @class */ /*@__PURE__*/ (function (_super) {
         try {
             for (var _b = __values(fromEnum(c)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var d = _c.value;
-                if (0 == StringComparer.b.compare(d.lo, a)) {
+                if (0 == StringComparer.b.compare(d.lp, a)) {
                     return d;
                 }
             }

package/esm5/lib/NumericCellPresenter.js

@@ -29,17 +29,20 @@ var NumericCellPresenter = /** @class */ /*@__PURE__*/ (function (_super) {
         _super.prototype.b.call(this, a);
         var b = a;
         if (a.a3) {
-            if (a.a8(NumericCellModel.m4) || b.ml()) {
-                b.j1 = this.e(b);
-                this.d.cl.setRawText(b.j1);
+            if (a.a8(NumericCellModel.m8) || a.a8(NumericCellModel.mw) || a.a8(NumericCellModel.hb) || b.mp()) {
+                b.j3 = this.e(b);
+                this.d.cl.setRawText(b.j3);
             }
             ContentCellModelHelper.a(this.a.ae, b, this.a.ah, this.d.cl, this.a);
         }
     };
     NumericCellPresenter.prototype.e = function (a) {
-        if (a.na != null) {
-            var val_ = a.mo;
-            var override_ = a.na;
+        if (a.ki != null) {
+            return a.ki;
+        }
+        if (a.ne != null) {
+            var val_ = a.ms;
+            var override_ = a.ne;
             return (override_.format(val_));
         }
         return NumericCellFormatter.c(a);