jsbox-cview 1.6.5 → 1.6.6

package/dist/components/dynamic-itemsize-section-matrix.js

@@ -0,0 +1,293 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DynamicItemSizeSectionMatrix = void 0;
+const uitools_1 = require("../utils/uitools");
+const base_1 = require("./base");
+const single_views_1 = require("./single-views");
+function _getColumnsAndItemSizeWidth(containerWidth, minItemWidth, maxColumns, spacing) {
+    if (minItemWidth > containerWidth - 2 * spacing) {
+        return {
+            columns: 1,
+            itemSizeWidth: containerWidth - 2 * spacing,
+        };
+    }
+    const columns = Math.max(Math.min(Math.floor((containerWidth - spacing) / (minItemWidth + spacing)), maxColumns), 1);
+    const itemSizeWidth = Math.max(Math.floor((containerWidth - spacing * (columns + 1)) / columns), minItemWidth);
+    return {
+        columns,
+        itemSizeWidth,
+    };
+}
+function _getTextHeight(text, width) {
+    return (0, uitools_1.getTextHeight)(text, {
+        width,
+        font: $font(13),
+        inset: 0,
+    });
+}
+/**
+ * # CView Dynamic ItemSize Section Matrix
+ *
+ * 此组件是为了在 Dynamic ItemSize Matrix 的基础上添加 SectionTitle
+ *
+ * - 使用此组件必须在每个section中添加title，如果title为空字符串，依然添加高度35的空格(包含spacing)
+ * - sectionTitle的字体为font(13)，左右边距为16（不含spacing），即总宽度为 totalWidth - 2 * spacing - 32
+ * - 由于它必然和底下的item会有spacing，所以不建议spacing设的太大，那样会很违和
+ * - sectionTitle会使得section之间的间隔增加自身的高度
+ * - matrix事件会自动调整indexPath，包括didSelect、didLongPress、forEachItem
+ * - matrix的方法都在该组件中重新实现，自动调整indexPath
+ * - 不支持matrix原有的重新排序、自动大小功能，为防止sectionTitle暴露，也不支持menu
+ * - 不支持Dynamic ItemSize Matrix的dynamicHeightEnabled、heightToWidth
+ *
+ * ## 动态调整 itemSize
+ *
+ * 动态的改变自己的 itemSize，从而使得 spacing 被优先满足。
+ * 思路为在 matrix 上层套一个 superView，在旋转的时候 superView 会调用 matrix.relayout()
+ * 和 matrix.reload()，从而触发 itemSize 事件
+ *
+ * 其排布逻辑是这样的:
+ *
+ * 1. 由 minItemWidth，spacing，maxColumns 这三个参数决定 cloumns，
+ *    并结合 totalWidth 确定 itemSize.width
+ * 2. 确定 itemHeight 有两种方法:
+ *    - fixedItemHeight 固定高度，优先级第二
+ *    - event: itemHeight(width) => height 通过 width 动态计算，优先级最高
+ * 3. 如果 minItemWidth 比 totalWidth - 2 * spacing 还要小，那么 itemSize.width
+ *    会被设定为 totalWidth - 2 * spacing，以保证item不会超出边框
+ *
+ * ## props:
+ *
+ * 可以使用 matrix 的全部属性。
+ *
+ * 但data的类型调整为：
+ * { title: string; items: Record<string, unknown>[] }
+ *
+ * 特殊属性:
+ *
+ * - fixedItemHeight 固定 itemSize 高度
+ * - minItemWidth 最小的 itemSize 宽度
+ * - maxColumns 最大列数
+ * - spacing
+ *
+ * events:
+ *
+ * 可以使用 matrix 除 itemSize 以外的全部事件
+ *
+ * 其他特殊事件:
+ *
+ * - itemHeight: width => height 通过 itemWidth 动态计算 itemHeight
+ *
+ *
+ * 方法:
+ * - get data
+ * - set data
+ * - reload(): void;
+ * - object(indexPath: NSIndexPath): any;
+ * - insert(args: { indexPath: NSIndexPath;value: any; } ): void;
+ * - delete(indexPathOrIndex: NSIndexPath | number): void;
+ * - cell(indexPath: NSIndexPath): AllUIView;
+ * - scrollTo(args: { indexPath: NSIndexPath; animated?: boolean }): void;
+ */
+class DynamicItemSizeSectionMatrix extends base_1.Base {
+    constructor({ props, layout, events, }) {
+        super();
+        this._totalWidth = 0;
+        this._columns = 1;
+        this._props = props;
+        this._data = this._props.data ?? [];
+        this._events = events;
+        this._itemSizeWidth = 0;
+        this._itemSizeHeight = 0;
+        this._fixedItemHeight = this._props.fixedItemHeight ?? 96;
+        this._minItemWidth = this._props.minItemWidth ?? 96;
+        this._maxColumns = this._props.maxColumns ?? 5;
+        this._spacing = this._props.spacing ?? 6;
+        const { itemHeight, didSelect, didLongPress, forEachItem, ...otherEvents } = this._events;
+        this.matrix = new single_views_1.Matrix({
+            props: {
+                ...props,
+                data: this._mapData(this._data),
+                template: this._mapTemplate(props.template),
+            },
+            layout: $layout.fill,
+            events: {
+                ...otherEvents,
+                itemSize: (_sender, indexPath) => {
+                    if (this._totalWidth === 0) {
+                        return $size(0, 0);
+                    }
+                    if (indexPath.item === 0) {
+                        const width = Math.max(this._totalWidth - 2 * this._spacing, 32);
+                        const textHeight = _getTextHeight(this._data[indexPath.section].title, width - 32);
+                        const height = textHeight + 35 - this._spacing * (indexPath.section === 0 ? 1 : 2);
+                        return $size(width, height);
+                    }
+                    else {
+                        return $size(this._itemSizeWidth, this._itemSizeHeight);
+                    }
+                },
+                didSelect: didSelect
+                    ? (sender, indexPath) => {
+                        if (indexPath.item === 0) {
+                            return;
+                        }
+                        else {
+                            didSelect(sender, $indexPath(indexPath.section, indexPath.item - 1), this._data[indexPath.section].items[indexPath.item - 1]);
+                        }
+                    }
+                    : undefined,
+                didLongPress: didLongPress
+                    ? (sender, indexPath) => {
+                        if (indexPath.item === 0) {
+                            return;
+                        }
+                        else {
+                            didLongPress(sender, $indexPath(indexPath.section, indexPath.item - 1), this._data[indexPath.section].items[indexPath.item - 1]);
+                        }
+                    }
+                    : undefined,
+                forEachItem: forEachItem
+                    ? (sender, indexPath) => {
+                        if (indexPath.item === 0) {
+                            return;
+                        }
+                        else {
+                            forEachItem(sender, $indexPath(indexPath.section, indexPath.item - 1));
+                        }
+                    }
+                    : undefined,
+            },
+        });
+        this._defineView = () => {
+            return {
+                type: "view",
+                props: {
+                    id: this.id,
+                    bgcolor: $color("clear"),
+                },
+                layout,
+                views: [this.matrix.definition],
+                events: {
+                    layoutSubviews: (sender) => {
+                        sender.relayout();
+                        if (sender.frame.width === this._totalWidth)
+                            return;
+                        this._totalWidth = sender.frame.width;
+                        const { columns, itemSizeWidth } = _getColumnsAndItemSizeWidth(this._totalWidth, this._minItemWidth, this._maxColumns, this._spacing);
+                        this._columns = columns;
+                        this._itemSizeWidth = itemSizeWidth;
+                        this._itemSizeHeight = this._events.itemHeight
+                            ? this._events.itemHeight(this._itemSizeWidth)
+                            : this._fixedItemHeight;
+                        this.matrix.view.reload();
+                    },
+                },
+            };
+        };
+    }
+    _mapData(data) {
+        return data.map((n) => {
+            const mappedItems = n.items.map((n) => {
+                return {
+                    __section_title__: { hidden: true },
+                    __original_template__: { hidden: false },
+                    ...n,
+                };
+            });
+            return {
+                title: "",
+                items: [
+                    {
+                        __section_title__: { hidden: false },
+                        __section_title_label__: { text: n.title },
+                        __original_template__: { hidden: true },
+                    },
+                    ...mappedItems,
+                ],
+            };
+        });
+    }
+    _mapTemplate(template) {
+        if (!template)
+            return;
+        const newTemplate = {
+            views: [
+                {
+                    type: "view",
+                    props: {
+                        id: "__section_title__",
+                    },
+                    layout: $layout.fill,
+                    views: [
+                        {
+                            // 在这里放一个透明且无效果的button，从而取消item自己的highlight效果
+                            type: "button",
+                            props: {
+                                bgcolor: $color("clear"),
+                            },
+                            layout: $layout.fill,
+                        },
+                        {
+                            type: "label",
+                            props: {
+                                id: "__section_title_label__",
+                                bgcolor: $color("clear"),
+                                font: $font(13),
+                                textColor: $color("secondaryText"),
+                                lines: 0,
+                            },
+                            layout: (make, view) => {
+                                make.left.right.inset(16);
+                                make.bottom.inset(0);
+                            },
+                        },
+                    ],
+                },
+                {
+                    type: "view",
+                    props: {
+                        ...template.props,
+                        id: "__original_template__",
+                    },
+                    layout: $layout.fill,
+                    views: template.views,
+                },
+            ],
+        };
+        return newTemplate;
+    }
+    get data() {
+        return this._data;
+    }
+    set data(data) {
+        this._data = data;
+        this.matrix.view.data = this._mapData(data);
+        this.reload();
+    }
+    reload() {
+        this.matrix.view.reload();
+    }
+    object(indexPath) {
+        return this._data?.[indexPath.section]?.items[indexPath.item];
+    }
+    insert({ indexPath, value }) {
+        this._data?.[indexPath.section]?.items.splice(indexPath.item, 0, value);
+        this.matrix.view.data = this._mapData(this._data);
+        this.reload();
+    }
+    delete(indexPath) {
+        this._data?.[indexPath.section]?.items.splice(indexPath.item, 1);
+        this.matrix.view.data = this._mapData(this._data);
+        this.reload();
+    }
+    cell(indexPath) {
+        return this.matrix.view.cell($indexPath(indexPath.section, indexPath.item + 1));
+    }
+    scrollTo({ indexPath, animated }) {
+        this.matrix.view.scrollTo({
+            indexPath: $indexPath(indexPath.section, indexPath.item + 1),
+            animated,
+        });
+    }
+}
+exports.DynamicItemSizeSectionMatrix = DynamicItemSizeSectionMatrix;

package/dist/components/dynamic-preference-listview.js

@@ -36,14 +36,25 @@ class DynamicPreferenceListView extends base_1.Base {
         super();
         this._sections = sections.map((n) => ({
             title: n.title,
-            rows: n.rows.map((r) => (Object.assign({}, r))),
+            rows: n.rows.map((r) => ({ ...r })),
         }));
-        this._props = Object.assign({ stringLeftInset: 120, infoAndLinkLeftInset: 120, sliderWidth: 200, tabWidth: 200, symbolSizeForSymbolAction: $size(24, 24) }, props);
+        this._props = {
+            stringLeftInset: 120,
+            infoAndLinkLeftInset: 120,
+            sliderWidth: 200,
+            tabWidth: 200,
+            symbolSizeForSymbolAction: $size(24, 24),
+            ...props,
+        };
         this._layout = layout;
         this._defineView = () => {
             return {
                 type: "list",
-                props: Object.assign(Object.assign({ style: 2 }, this._props), { id: this.id, template: {
+                props: {
+                    style: 2,
+                    ...this._props,
+                    id: this.id,
+                    template: {
                         views: [
                             {
                                 type: "view",
@@ -169,17 +180,15 @@ class DynamicPreferenceListView extends base_1.Base {
                                                 },
                                                 events: {
                                                     changed: (sender) => {
-                                                        var _a;
                                                         const { section, row } = sender.info;
                                                         const options = this._sections[section].rows[row];
                                                         const label = sender.next;
-                                                        label.text = this._handleSliderValue(sender.value * ((_a = options.max) !== null && _a !== void 0 ? _a : 1), options.decimal, options.min, options.max).toString();
+                                                        label.text = this._handleSliderValue(sender.value * (options.max ?? 1), options.decimal, options.min, options.max).toString();
                                                     },
                                                     touchesEnded: (sender) => {
-                                                        var _a;
                                                         const { section, row } = sender.info;
                                                         const options = this._sections[section].rows[row];
-                                                        this._sections[section].rows[row].value = this._handleSliderValue(sender.value * ((_a = options.max) !== null && _a !== void 0 ? _a : 1), options.decimal, options.min, options.max);
+                                                        this._sections[section].rows[row].value = this._handleSliderValue(sender.value * (options.max ?? 1), options.decimal, options.min, options.max);
                                                         if (events.changed)
                                                             events.changed(this.values);
                                                     },
@@ -263,11 +272,12 @@ class DynamicPreferenceListView extends base_1.Base {
                                 ],
                             },
                         ],
-                    }, data: this._map(this._sections) }),
+                    },
+                    data: this._map(this._sections),
+                },
                 layout: this._layout,
                 events: {
                     didSelect: (sender, indexPath, data) => {
-                        var _a, _b;
                         const row = this._sections[indexPath.section].rows[indexPath.row];
                         if (!static_preference_listview_1.selectableTypes.includes(row.type))
                             return;
@@ -288,7 +298,7 @@ class DynamicPreferenceListView extends base_1.Base {
                             }
                             case "number": {
                                 $input.text({
-                                    text: (_a = row.value) === null || _a === void 0 ? void 0 : _a.toString(),
+                                    text: row.value?.toString(),
                                     type: $kbType.decimal,
                                     placeholder: row.placeholder,
                                     handler: (text) => {
@@ -309,7 +319,7 @@ class DynamicPreferenceListView extends base_1.Base {
                             }
                             case "integer": {
                                 $input.text({
-                                    text: (_b = row.value) === null || _b === void 0 ? void 0 : _b.toString(),
+                                    text: row.value?.toString(),
                                     type: $kbType.number,
                                     placeholder: row.placeholder,
                                     handler: (text) => {
@@ -472,7 +482,6 @@ class DynamicPreferenceListView extends base_1.Base {
         return sections.map((section, sectionIndex) => ({
             title: section.title,
             rows: section.rows.map((n, rowIndex) => {
-                var _a, _b, _c;
                 const data = generateDefaultRow(n);
                 switch (n.type) {
                     case "string": {
@@ -531,7 +540,7 @@ class DynamicPreferenceListView extends base_1.Base {
                             text: adjustedValue,
                         };
                         data.slider = {
-                            value: adjustedValue / ((_a = n.max) !== null && _a !== void 0 ? _a : 1),
+                            value: adjustedValue / (n.max ?? 1),
                             info: { section: sectionIndex, row: rowIndex, key: n.key },
                             //min: n.min, // 不可用，否则会出现slider滑动结束变为0点的bug
                             //max: n.max,
@@ -594,8 +603,8 @@ class DynamicPreferenceListView extends base_1.Base {
                         data.symbol = {
                             hidden: n.symbol ? false : true,
                             symbol: n.symbol,
-                            tintColor: (_b = n.tintColor) !== null && _b !== void 0 ? _b : $color("primaryText"),
-                            contentMode: (_c = n.contentMode) !== null && _c !== void 0 ? _c : 1,
+                            tintColor: n.tintColor ?? $color("primaryText"),
+                            contentMode: n.contentMode ?? 1,
                         };
                         break;
                     }
@@ -616,7 +625,7 @@ class DynamicPreferenceListView extends base_1.Base {
     set sections(sections) {
         this._sections = sections.map((n) => ({
             title: n.title,
-            rows: n.rows.map((r) => (Object.assign({}, r))),
+            rows: n.rows.map((r) => ({ ...r })),
         }));
         this.view.data = this._map(this._sections);
     }

package/dist/components/dynamic-rowheight-list.js

@@ -37,9 +37,14 @@ class DynamicRowHeightList extends base_1.Base {
             }
             return {
                 type: "list",
-                props: Object.assign({ id: this.id, data }, props),
+                props: {
+                    id: this.id,
+                    data,
+                    ...props,
+                },
                 layout,
-                events: Object.assign({ rowHeight: (sender, indexPath) => {
+                events: {
+                    rowHeight: (sender, indexPath) => {
                         if (sections) {
                             const cview = sections[indexPath.section].rows[indexPath.row];
                             return cview.heightToWidth(sender.frame.width);
@@ -50,7 +55,9 @@ class DynamicRowHeightList extends base_1.Base {
                         else {
                             throw new Error("sections or rows must be provided");
                         }
-                    } }, events),
+                    },
+                    ...events,
+                },
             };
         };
     }

package/dist/components/enhanced-imageview.js

@@ -25,7 +25,7 @@ const cvid_1 = require("../utils/cvid");
 class EnhancedImageView extends base_1.Base {
     constructor({ props, layout, events = {}, }) {
         super();
-        this._props = Object.assign({ maxZoomScale: 2 }, props);
+        this._props = { maxZoomScale: 2, ...props };
         this._scroll = new single_views_1.Scroll({
             props: {
                 zoomEnabled: true,

package/dist/components/flowlayout.js

@@ -41,8 +41,8 @@ class Flowlayout extends base_1.Base {
         this._wrappers = props.items.map((item, index) => new WrapperView({
             item,
             menu: props.menu,
-            didSelect: events === null || events === void 0 ? void 0 : events.didSelect,
-            didLongPress: events === null || events === void 0 ? void 0 : events.didLongPress,
+            didSelect: events?.didSelect,
+            didLongPress: events?.didLongPress,
             flowlayout: this,
             index,
         }));
@@ -74,17 +74,14 @@ class Flowlayout extends base_1.Base {
     }
     set items(items) {
         this._props.items = items;
-        this._wrappers = items.map((item, index) => {
-            var _a, _b;
-            return new WrapperView({
-                item,
-                menu: this._props.menu,
-                didSelect: (_a = this._events) === null || _a === void 0 ? void 0 : _a.didSelect,
-                didLongPress: (_b = this._events) === null || _b === void 0 ? void 0 : _b.didLongPress,
-                flowlayout: this,
-                index,
-            });
-        });
+        this._wrappers = items.map((item, index) => new WrapperView({
+            item,
+            menu: this._props.menu,
+            didSelect: this._events?.didSelect,
+            didLongPress: this._events?.didLongPress,
+            flowlayout: this,
+            index,
+        }));
         this.view.views.forEach((v) => v.remove());
         this._wrappers.forEach((wrapper) => this.view.add(wrapper.definition));
         const height = this._layoutWrappers();

package/dist/components/image-pager.js

@@ -24,7 +24,12 @@ class ImagePager extends base_1.Base {
      */
     constructor({ props, layout, events = {}, }) {
         super();
-        this._props = Object.assign({ srcs: [], page: 0, doubleTapToZoom: true }, props);
+        this._props = {
+            srcs: [],
+            page: 0,
+            doubleTapToZoom: true,
+            ...props,
+        };
         this._pageLoadRecorder = {};
         this._matrix = new single_views_1.Matrix({
             props: {

package/dist/components/oc-webview.js

@@ -42,6 +42,7 @@ class OCWebView extends base_1.Base {
         config.invoke("setWebsiteDataStore:", $objc("WKWebsiteDataStore").invoke("defaultDataStore"));
         const webView = $objc("WKWebView").invoke("alloc.initWithFrame:configuration:", $rect(0, 0, 0, 0), config);
         this.webView = webView;
+        this._originUrl = props.url;
         this._defineView = () => {
             return {
                 type: "runtime",
@@ -85,6 +86,11 @@ class OCWebView extends base_1.Base {
         const nsurl = this.webView.invoke("URL");
         return nsurl ? nsurl.invoke("absoluteString").rawValue() : "";
     }
+    set url(urlStr) {
+        const url = $objc("NSURL").invoke("URLWithString:", urlStr);
+        const req = $objc("NSURLRequest").invoke("requestWithURL:", url);
+        this.webView.invoke("loadRequest:", req);
+    }
     get title() {
         const title = this.webView.invoke("title");
         return title ? title.rawValue() : "";
@@ -109,7 +115,10 @@ class OCWebView extends base_1.Base {
     reload() {
         this.webView.invoke("reload");
     }
-    evaluateJavaScript(script) {
+    reloadFromOrigin() {
+        this.url = this._originUrl;
+    }
+    exec(script) {
         return new Promise((resolve, reject) => {
             this.webView.invoke("evaluateJavaScript:completionHandler:", script, $block("void, id, NSError *", (result, error) => {
                 const jsError = error ? error.jsValue() : null;
@@ -125,13 +134,12 @@ class OCWebView extends base_1.Base {
                     resolve(result.jsValue());
                     return;
                 }
-                if (typeof result.rawValue === "function") {
-                    resolve(result.rawValue());
-                    return;
-                }
                 resolve(result);
             }));
         });
     }
+    eval({ script, handler }) {
+        this.exec(script).then((result) => handler(result), (error) => handler(undefined, error));
+    }
 }
 exports.OCWebView = OCWebView;

package/dist/components/page-control.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PageControl = void 0;
 const single_views_1 = require("./single-views");
@@ -36,8 +25,8 @@ class PageControl extends single_views_1.Runtime {
      *
      */
     constructor({ props, layout, events = {}, }) {
-        const { numberOfPages = 3, currentPage = 0, pageIndicatorTintColor, currentPageIndicatorTintColor } = props, restProps = __rest(props, ["numberOfPages", "currentPage", "pageIndicatorTintColor", "currentPageIndicatorTintColor"]);
-        const { changed } = events, restEvents = __rest(events, ["changed"]);
+        const { numberOfPages = 3, currentPage = 0, pageIndicatorTintColor, currentPageIndicatorTintColor, ...restProps } = props;
+        const { changed, ...restEvents } = events;
         super({ props: restProps, layout, events: restEvents });
         this._numberOfPages = numberOfPages;
         this._currentPage = currentPage;

package/dist/components/pageviewer-titlebar.js

@@ -1,15 +1,4 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PageViewerTitleBar = void 0;
 const base_1 = require("./base");
@@ -38,8 +27,13 @@ class PageViewerTitleBar extends base_1.Base {
      */
     constructor({ props, layout, events = {}, }) {
         super();
-        this._props = Object.assign({ index: 0, selectedItemColor: $color("systemLink"), defaultItemColor: $color("secondaryText") }, props);
-        const { changed } = events, restEvents = __rest(events, ["changed"]);
+        this._props = {
+            index: 0,
+            selectedItemColor: $color("systemLink"),
+            defaultItemColor: $color("secondaryText"),
+            ...props,
+        };
+        const { changed, ...restEvents } = events;
         this._floatedIndex = this._props.index;
         this._lineStartLocationPercentage = this._floatedIndex / this._props.items.length;
         this.labels = this._props.items.map((n, i) => {

package/dist/components/pageviewer.js

@@ -23,7 +23,10 @@ class PageViewer extends base_1.Base {
      */
     constructor({ props, layout, events = {}, }) {
         super();
-        this._props = Object.assign({ page: 0 }, props);
+        this._props = {
+            page: 0,
+            ...props,
+        };
         this._events = events;
         this._pageWidth = 0;
         this._floatPage = this._props.page;

package/dist/components/refresh-button.js

@@ -17,14 +17,13 @@ class RefreshButton extends base_1.Base {
         this._loading = false;
         this._layout = layout;
         this._defineView = () => {
-            var _a, _b, _c;
             return {
                 type: "button",
                 props: {
                     id: this.id,
                     bgcolor: $color("clear"),
-                    enabled: (_a = props === null || props === void 0 ? void 0 : props.enabled) !== null && _a !== void 0 ? _a : true,
-                    hidden: (_b = props === null || props === void 0 ? void 0 : props.hidden) !== null && _b !== void 0 ? _b : false,
+                    enabled: props?.enabled ?? true,
+                    hidden: props?.hidden ?? false,
                 },
                 layout: this._layout,
                 events,
@@ -34,7 +33,7 @@ class RefreshButton extends base_1.Base {
                         props: {
                             id: this.id + "_image",
                             symbol: "arrow.clockwise",
-                            tintColor: (_c = props === null || props === void 0 ? void 0 : props.tintColor) !== null && _c !== void 0 ? _c : $color("primaryText"),
+                            tintColor: props?.tintColor ?? $color("primaryText"),
                             contentMode: 1,
                             hidden: this._loading,
                         },

package/dist/components/rotating-view.js

@@ -25,7 +25,12 @@ class RotatingView extends base_1.Base {
      */
     constructor({ props, layout, events = {}, }) {
         super();
-        this._props = Object.assign({ contentMode: 1, rps: 0.5, clockwise: true }, props);
+        this._props = {
+            contentMode: 1,
+            rps: 0.5,
+            clockwise: true,
+            ...props,
+        };
         this._rotatingFlag = false;
         if (this._props.cview) {
             this._innerView = this._props.cview;
@@ -45,7 +50,10 @@ class RotatingView extends base_1.Base {
         this._defineView = () => {
             return {
                 type: "view",
-                props: Object.assign(Object.assign({}, this._props), { id: this.id }),
+                props: {
+                    ...this._props,
+                    id: this.id,
+                },
                 layout,
                 events: {
                     ready: (sender) => {