@tuya-miniapp/smart-ui 2.1.7-beta-2 → 2.1.8-beta-1

package/dist/circle/index.js

@@ -3,7 +3,6 @@ import { SmartComponent } from '../common/component';
 SmartComponent({
     props: {
         className: String,
-        style: String,
         customStyle: String,
         size: {
             type: String,

package/dist/circle/index.wxml

@@ -1,4 +1,4 @@
-<view class="smart-progress-circle" style="width:{{size}};height:{{size}};padding:{{trackWidth}}px;background:{{fillColor}};{{style}};{{customStyle}}">
+<view class="smart-progress-circle" style="width:{{size}};height:{{size}};padding:{{trackWidth}}px;background:{{fillColor}};{{customStyle}}">
   <view class="smart-progress-circle-box smart-progress-circle-box-left">
     <view class="smart-progress-circle-bar smart-progress-circle-bar-left" style="transform:{{transformLeft}};background:{{trackColor}};">
     </view>

package/dist/dialog/dialog.d.ts

@@ -46,6 +46,9 @@ interface DialogInputOptions extends DialogOptions {
     placeholder?: string;
     maxlength?: number;
 }
+export declare const contextRef: {
+    value: DialogContext | null;
+};
 declare const Dialog: {
     (options: DialogOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;
     alert(options: DialogOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;

package/dist/dialog/dialog.js

@@ -1,3 +1,4 @@
+import { getCurrentPage } from '../common/utils';
 let queue = [];
 const defaultOptions = {
     show: false,
@@ -28,15 +29,16 @@ const defaultOptions = {
     maxlength: 20,
 };
 let currentOptions = Object.assign({}, defaultOptions);
-function getContext() {
-    const pages = getCurrentPages();
-    return pages[pages.length - 1];
-}
+export const contextRef = {
+    value: null,
+};
 const Dialog = (options) => {
     options = Object.assign(Object.assign({}, currentOptions), options);
     return new Promise((resolve, reject) => {
         var _a;
-        const context = (typeof options.context === 'function' ? options.context() : options.context) || getContext();
+        const context = (typeof options.context === 'function' ? options.context() : options.context) ||
+            contextRef.value ||
+            getCurrentPage();
         const selector = options.selector;
         const dialog = context.selectComponent(options.selector);
         if ((queue === null || queue === void 0 ? void 0 : queue.length) > 0 && ((_a = queue === null || queue === void 0 ? void 0 : queue[0]) === null || _a === void 0 ? void 0 : _a.id) === (dialog === null || dialog === void 0 ? void 0 : dialog.id)) {

package/dist/dialog/index.js

@@ -2,6 +2,7 @@ import warningIcon from '@tuya-miniapp/icons/dist/svg/Warning';
 import { SmartComponent } from '../common/component';
 import { button } from '../mixins/button';
 import { toPromise } from '../common/utils';
+import { contextRef } from './dialog';
 SmartComponent({
     mixins: [button],
     classes: ['cancle-button-class', 'confirm-button-class'],
@@ -90,6 +91,9 @@ SmartComponent({
         },
         callback: (() => { }),
     },
+    mounted: function () {
+        contextRef.value = this;
+    },
     methods: {
         onConfirm() {
             this.handleAction('confirm');

package/dist/notify/index.js

@@ -1,6 +1,7 @@
 import { SmartComponent } from '../common/component';
 import { WHITE } from '../common/color';
 import { getSystemInfoSync } from '../common/utils';
+import { contextRef } from './notify';
 SmartComponent({
     props: {
         message: String,
@@ -45,6 +46,9 @@ SmartComponent({
         const { statusBarHeight } = getSystemInfoSync();
         this.setData({ statusBarHeight });
     },
+    mounted: function () {
+        contextRef.value = this;
+    },
     methods: {
         show() {
             const { duration, onOpened } = this.data;

package/dist/notify/notify.d.ts

@@ -1,3 +1,6 @@
+/// <reference types="miniprogram-api-typings" />
+/// <reference types="miniprogram-api-typings" />
+type NotifyContext = WechatMiniprogram.Component.TrivialInstance | WechatMiniprogram.Page.TrivialInstance;
 interface NotifyOptions {
     type?: 'primary' | 'success' | 'danger' | 'warning';
     transition?: 'fade' | 'fade-up' | 'fade-down' | 'fade-left' | 'fade-right' | 'slide-up' | 'slide-down' | 'slide-left' | 'slide-right';
@@ -14,6 +17,9 @@ interface NotifyOptions {
     onOpened?: () => void;
     onClose?: () => void;
 }
+export declare const contextRef: {
+    value: NotifyContext | null;
+};
 declare function Notify(options: NotifyOptions | string): any;
 declare namespace Notify {
     var clear: (options?: NotifyOptions | undefined) => void;

package/dist/notify/notify.js

@@ -1,3 +1,4 @@
+import { getCurrentPage } from '../common/utils';
 import { WHITE } from '../common/color';
 const defaultOptions = {
     selector: '#smart-notify',
@@ -20,13 +21,14 @@ function parseOptions(message) {
     }
     return typeof message === 'string' ? { message } : message;
 }
-function getContext() {
-    const pages = getCurrentPages();
-    return pages[pages.length - 1];
-}
+export const contextRef = {
+    value: null,
+};
 export default function Notify(options) {
     options = Object.assign(Object.assign({}, currentOptions), parseOptions(options));
-    const context = options.context || getContext();
+    const context = (typeof options.context === 'function' ? options.context() : options.context) ||
+        contextRef.value ||
+        getCurrentPage();
     const notify = context.selectComponent(options.selector);
     delete options.context;
     delete options.selector;
@@ -39,7 +41,9 @@ export default function Notify(options) {
 }
 Notify.clear = function (options) {
     options = Object.assign(Object.assign({}, defaultOptions), parseOptions(options));
-    const context = options.context || getContext();
+    const context = (typeof options.context === 'function' ? options.context() : options.context) ||
+        contextRef.value ||
+        getCurrentPage();
     const notify = context.selectComponent(options.selector);
     if (notify) {
         notify.hide();

package/dist/toast/index.js

@@ -1,5 +1,6 @@
 import { Success, Alarm, Error } from './icons';
 import { SmartComponent } from '../common/component';
+import { contextRef } from './toast';
 SmartComponent({
     props: {
         show: Boolean,
@@ -10,7 +11,6 @@ SmartComponent({
             type: Number,
             value: 1000,
         },
-        //
         type: {
             type: String,
             value: 'text',
@@ -32,6 +32,9 @@ SmartComponent({
         error: Error,
         warn: Alarm,
     },
+    mounted: function () {
+        contextRef.value = this;
+    },
     methods: {
         // for prevent touchmove
         noop() { },

package/dist/toast/index.wxml

@@ -14,6 +14,7 @@
     catch:touchmove="noop"
     style="{{ width ? ('width: ' + width + 'px') : '' }}"
   >
+  
     <!-- text only -->
     <text wx:if="{{ type === 'text' }}">{{ message }}</text>
 

package/dist/toast/toast.d.ts

@@ -17,6 +17,9 @@ interface ToastOptions {
     onClose?: () => void;
     width?: number;
 }
+export declare const contextRef: {
+    value: ToastContext | null;
+};
 declare function Toast(toastOptions: ToastOptions | ToastMessage): WechatMiniprogram.Component.TrivialInstance | undefined;
 declare namespace Toast {
     var loading: (options: ToastMessage | ToastOptions) => WechatMiniprogram.Component.TrivialInstance | undefined;

package/dist/toast/toast.js

@@ -1,3 +1,4 @@
+import { getCurrentPage } from '../common/utils';
 import { isObj } from '../common/validator';
 const defaultOptions = {
     type: 'text',
@@ -18,13 +19,14 @@ let currentOptions = Object.assign({}, defaultOptions);
 function parseOptions(message) {
     return isObj(message) ? message : { message };
 }
-function getContext() {
-    const pages = getCurrentPages();
-    return pages[pages.length - 1];
-}
+export const contextRef = {
+    value: null,
+};
 function Toast(toastOptions) {
     const options = Object.assign(Object.assign({}, currentOptions), parseOptions(toastOptions));
-    const context = (typeof options.context === 'function' ? options.context() : options.context) || getContext();
+    const context = (typeof options.context === 'function' ? options.context() : options.context) ||
+        contextRef.value ||
+        getCurrentPage();
     const toast = context.selectComponent(options.selector);
     if (!toast) {
         console.warn('未找到 smart-toast 节点，请确认 selector 及 context 是否正确');

package/lib/circle/index.js

@@ -5,7 +5,6 @@ var component_1 = require("../common/component");
 (0, component_1.SmartComponent)({
     props: {
         className: String,
-        style: String,
         customStyle: String,
         size: {
             type: String,

package/lib/circle/index.wxml

@@ -1,4 +1,4 @@
-<view class="smart-progress-circle" style="width:{{size}};height:{{size}};padding:{{trackWidth}}px;background:{{fillColor}};{{style}};{{customStyle}}">
+<view class="smart-progress-circle" style="width:{{size}};height:{{size}};padding:{{trackWidth}}px;background:{{fillColor}};{{customStyle}}">
   <view class="smart-progress-circle-box smart-progress-circle-box-left">
     <view class="smart-progress-circle-bar smart-progress-circle-bar-left" style="transform:{{transformLeft}};background:{{trackColor}};">
     </view>

package/lib/dialog/dialog.d.ts

@@ -46,6 +46,9 @@ interface DialogInputOptions extends DialogOptions {
     placeholder?: string;
     maxlength?: number;
 }
+export declare const contextRef: {
+    value: DialogContext | null;
+};
 declare const Dialog: {
     (options: DialogOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;
     alert(options: DialogOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;

package/lib/dialog/dialog.js

@@ -11,6 +11,8 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.contextRef = void 0;
+var utils_1 = require("../common/utils");
 var queue = [];
 var defaultOptions = {
     show: false,
@@ -41,15 +43,16 @@ var defaultOptions = {
     maxlength: 20,
 };
 var currentOptions = __assign({}, defaultOptions);
-function getContext() {
-    var pages = getCurrentPages();
-    return pages[pages.length - 1];
-}
+exports.contextRef = {
+    value: null,
+};
 var Dialog = function (options) {
     options = __assign(__assign({}, currentOptions), options);
     return new Promise(function (resolve, reject) {
         var _a;
-        var context = (typeof options.context === 'function' ? options.context() : options.context) || getContext();
+        var context = (typeof options.context === 'function' ? options.context() : options.context) ||
+            exports.contextRef.value ||
+            (0, utils_1.getCurrentPage)();
         var selector = options.selector;
         var dialog = context.selectComponent(options.selector);
         if ((queue === null || queue === void 0 ? void 0 : queue.length) > 0 && ((_a = queue === null || queue === void 0 ? void 0 : queue[0]) === null || _a === void 0 ? void 0 : _a.id) === (dialog === null || dialog === void 0 ? void 0 : dialog.id)) {

package/lib/dialog/index.js

@@ -7,6 +7,7 @@ var Warning_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Warning"))
 var component_1 = require("../common/component");
 var button_1 = require("../mixins/button");
 var utils_1 = require("../common/utils");
+var dialog_1 = require("./dialog");
 (0, component_1.SmartComponent)({
     mixins: [button_1.button],
     classes: ['cancle-button-class', 'confirm-button-class'],
@@ -95,6 +96,9 @@ var utils_1 = require("../common/utils");
         },
         callback: (function () { }),
     },
+    mounted: function () {
+        dialog_1.contextRef.value = this;
+    },
     methods: {
         onConfirm: function () {
             this.handleAction('confirm');

package/lib/notify/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
 var color_1 = require("../common/color");
 var utils_1 = require("../common/utils");
+var notify_1 = require("./notify");
 (0, component_1.SmartComponent)({
     props: {
         message: String,
@@ -47,6 +48,9 @@ var utils_1 = require("../common/utils");
         var statusBarHeight = (0, utils_1.getSystemInfoSync)().statusBarHeight;
         this.setData({ statusBarHeight: statusBarHeight });
     },
+    mounted: function () {
+        notify_1.contextRef.value = this;
+    },
     methods: {
         show: function () {
             var _this = this;

package/lib/notify/notify.d.ts

@@ -1,3 +1,6 @@
+/// <reference types="miniprogram-api-typings" />
+/// <reference types="miniprogram-api-typings" />
+type NotifyContext = WechatMiniprogram.Component.TrivialInstance | WechatMiniprogram.Page.TrivialInstance;
 interface NotifyOptions {
     type?: 'primary' | 'success' | 'danger' | 'warning';
     transition?: 'fade' | 'fade-up' | 'fade-down' | 'fade-left' | 'fade-right' | 'slide-up' | 'slide-down' | 'slide-left' | 'slide-right';
@@ -14,6 +17,9 @@ interface NotifyOptions {
     onOpened?: () => void;
     onClose?: () => void;
 }
+export declare const contextRef: {
+    value: NotifyContext | null;
+};
 declare function Notify(options: NotifyOptions | string): any;
 declare namespace Notify {
     var clear: (options?: NotifyOptions | undefined) => void;

package/lib/notify/notify.js

@@ -11,6 +11,8 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.contextRef = void 0;
+var utils_1 = require("../common/utils");
 var color_1 = require("../common/color");
 var defaultOptions = {
     selector: '#smart-notify',
@@ -33,13 +35,14 @@ function parseOptions(message) {
     }
     return typeof message === 'string' ? { message: message } : message;
 }
-function getContext() {
-    var pages = getCurrentPages();
-    return pages[pages.length - 1];
-}
+exports.contextRef = {
+    value: null,
+};
 function Notify(options) {
     options = __assign(__assign({}, currentOptions), parseOptions(options));
-    var context = options.context || getContext();
+    var context = (typeof options.context === 'function' ? options.context() : options.context) ||
+        exports.contextRef.value ||
+        (0, utils_1.getCurrentPage)();
     var notify = context.selectComponent(options.selector);
     delete options.context;
     delete options.selector;
@@ -53,7 +56,9 @@ function Notify(options) {
 exports.default = Notify;
 Notify.clear = function (options) {
     options = __assign(__assign({}, defaultOptions), parseOptions(options));
-    var context = options.context || getContext();
+    var context = (typeof options.context === 'function' ? options.context() : options.context) ||
+        exports.contextRef.value ||
+        (0, utils_1.getCurrentPage)();
     var notify = context.selectComponent(options.selector);
     if (notify) {
         notify.hide();

package/lib/toast/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var icons_1 = require("./icons");
 var component_1 = require("../common/component");
+var toast_1 = require("./toast");
 (0, component_1.SmartComponent)({
     props: {
         show: Boolean,
@@ -12,7 +13,6 @@ var component_1 = require("../common/component");
             type: Number,
             value: 1000,
         },
-        //
         type: {
             type: String,
             value: 'text',
@@ -34,6 +34,9 @@ var component_1 = require("../common/component");
         error: icons_1.Error,
         warn: icons_1.Alarm,
     },
+    mounted: function () {
+        toast_1.contextRef.value = this;
+    },
     methods: {
         // for prevent touchmove
         noop: function () { },

package/lib/toast/index.wxml

@@ -14,6 +14,7 @@
     catch:touchmove="noop"
     style="{{ width ? ('width: ' + width + 'px') : '' }}"
   >
+  
     <!-- text only -->
     <text wx:if="{{ type === 'text' }}">{{ message }}</text>
 

package/lib/toast/toast.d.ts

@@ -17,6 +17,9 @@ interface ToastOptions {
     onClose?: () => void;
     width?: number;
 }
+export declare const contextRef: {
+    value: ToastContext | null;
+};
 declare function Toast(toastOptions: ToastOptions | ToastMessage): WechatMiniprogram.Component.TrivialInstance | undefined;
 declare namespace Toast {
     var loading: (options: ToastMessage | ToastOptions) => WechatMiniprogram.Component.TrivialInstance | undefined;

package/lib/toast/toast.js

@@ -11,6 +11,8 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.contextRef = void 0;
+var utils_1 = require("../common/utils");
 var validator_1 = require("../common/validator");
 var defaultOptions = {
     type: 'text',
@@ -31,13 +33,14 @@ var currentOptions = __assign({}, defaultOptions);
 function parseOptions(message) {
     return (0, validator_1.isObj)(message) ? message : { message: message };
 }
-function getContext() {
-    var pages = getCurrentPages();
-    return pages[pages.length - 1];
-}
+exports.contextRef = {
+    value: null,
+};
 function Toast(toastOptions) {
     var options = __assign(__assign({}, currentOptions), parseOptions(toastOptions));
-    var context = (typeof options.context === 'function' ? options.context() : options.context) || getContext();
+    var context = (typeof options.context === 'function' ? options.context() : options.context) ||
+        exports.contextRef.value ||
+        (0, utils_1.getCurrentPage)();
     var toast = context.selectComponent(options.selector);
     if (!toast) {
         console.warn('未找到 smart-toast 节点，请确认 selector 及 context 是否正确');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-miniapp/smart-ui",
-  "version": "2.1.7-beta-2",
+  "version": "2.1.8-beta-1",
   "author": "MiniApp Team",
   "license": "MIT",
   "miniprogram": "lib",
@@ -78,7 +78,7 @@
   ],
   "dependencies": {
     "@ray-js/components-ty-slider": "^0.2.52",
-    "@tuya-miniapp/icons": "2.1.7-beta-1"
+    "@tuya-miniapp/icons": "^2.1.7"
   },
   "maintainers": [
     {