@tarojs/runtime 3.4.9 → 3.4.12

package/dist/current.d.ts

@@ -2,6 +2,7 @@ import { AppInstance, PageInstance } from './dsl/instance';
 export interface Router {
     params: Record<string, unknown>;
     path: string;
+    $taroPath: string;
     onReady: string;
     onHide: string;
     onShow: string;

package/dist/runtime.esm.js

@@ -1927,6 +1927,7 @@ TaroText = __decorate([
  *
  * https://www.w3.org/Style/CSS/all-properties.en.html
  */
+const WEBKIT = 'webkit';
 const styleProperties = [
     'all',
     'appearance',
@@ -2006,6 +2007,9 @@ function combine(prefix, list, excludeSelf) {
     !excludeSelf && styleProperties.push(prefix);
     list.forEach(item => {
         styleProperties.push(prefix + item);
+        if (prefix === WEBKIT) {
+            styleProperties.push('Webkit' + item);
+        }
     });
 }
 const color = 'Color';
@@ -2060,7 +2064,6 @@ combine('mask', ['Clip', 'Composite', image, 'Mode', 'Origin', 'Position', 'Repe
 combine('borderImage', ['Outset', 'Repeat', 'Slice', 'Source', 'Transform', width]);
 combine('maskBorder', ['Mode', 'Outset', 'Repeat', 'Slice', 'Source', width]);
 combine('font', ['Family', 'FeatureSettings', 'Kerning', 'LanguageOverride', 'MaxSize', 'MinSize', 'OpticalSizing', 'Palette', size, 'SizeAdjust', 'Stretch', style, 'Weight', 'VariationSettings']);
-combine('fontSynthesis', ['SmallCaps', style, 'Weight']);
 combine('transform', ['Box', 'Origin', style]);
 combine('background', [color, image, 'Attachment', 'BlendMode', 'Clip', 'Origin', 'Position', 'Repeat', size]);
 combine('listStyle', [image, 'Position', 'Type']);
@@ -2069,22 +2072,17 @@ combine('grid', ['Area', 'AutoColumns', 'AutoFlow', 'AutoRows']);
 combine('gridTemplate', ['Areas', 'Columns', 'Rows']);
 combine('overflow', ['Block', 'Inline', 'Wrap', 'X', 'Y']);
 combine('transition', ['Delay', 'Duration', 'Property', 'TimingFunction']);
-combine('lineStacking', ['Ruby', 'Shift', 'Strategy']);
 combine('color', ['Adjust', 'InterpolationFilters', 'Scheme']);
 combine('textAlign', ['All', 'Last']);
 combine('page', ['BreakAfter', 'BreakBefore', 'BreakInside']);
-combine('speak', ['Header', 'Numeral', 'Punctuation']);
 combine('animation', ['Delay', 'Direction', 'Duration', 'FillMode', 'IterationCount', 'Name', 'PlayState', 'TimingFunction']);
 combine('flex', ['Basis', 'Direction', 'Flow', 'Grow', 'Shrink', 'Wrap']);
 combine('offset', [...after_before, ...end_start, 'Anchor', 'Distance', 'Path', 'Position', 'Rotate']);
-combine('fontVariant', ['Alternates', 'Caps', 'EastAsian', 'Emoji', 'Ligatures', 'Numeric', 'Position']);
 combine('perspective', ['Origin']);
-combine('pitch', ['Range']);
 combine('clip', ['Path', 'Rule']);
 combine('flow', ['From', 'Into']);
 combine('align', ['Content', 'Items', 'Self'], true);
 combine('alignment', ['Adjust', 'Baseline'], true);
-combine('bookmark', ['Label', 'Level', 'State'], true);
 combine('borderStart', endRadius_startRadius, true);
 combine('borderEnd', endRadius_startRadius, true);
 combine('borderCorner', ['Fit', image, 'ImageTransform'], true);
@@ -2104,9 +2102,9 @@ combine('inline', ['BoxAlign', size, 'Sizing'], true);
 combine('text', ['CombineUpright', 'GroupAlign', 'Height', 'Indent', 'Justify', 'Orientation', 'Overflow', 'Shadow', 'SpaceCollapse', 'SpaceTrim', 'Spacing', 'Transform', 'UnderlinePosition', 'Wrap'], true);
 combine('shape', ['ImageThreshold', 'Inside', 'Margin', 'Outside'], true);
 combine('word', ['Break', 'Spacing', 'Wrap'], true);
-combine('nav', ['Down', 'Left', 'Right', 'Up'], true);
 combine('object', ['Fit', 'Position'], true);
-combine('box', ['DecorationBreak', 'Shadow', 'Sizing', 'Snap'], true);
+combine('box', ['DecorationBreak', 'Shadow', 'Sizing', 'Snap'], true);
+combine(WEBKIT, ['LineClamp', 'BoxOrient', 'TextFillColor', 'TextStroke', 'TextStrokeColor', 'TextStrokeWidth'], true);
 
 function setStyle(newVal, styleKey) {
     const old = this[styleKey];
@@ -2175,7 +2173,10 @@ class Style {
             const val = this[key];
             if (!val)
                 return;
-            const styleName = isCssVariable(key) ? key : toDashed(key);
+            let styleName = isCssVariable(key) ? key : toDashed(key);
+            if (styleName.indexOf('webkit') === 0 || styleName.indexOf('Webkit') === 0) {
+                styleName = `-${styleName}`;
+            }
             texts.push(`${styleName}: ${val};`);
         });
         return texts.join(' ');
@@ -4486,6 +4487,7 @@ function createPageConfig(component, pageName, data, pageConfig) {
         Current.router = {
             params: page.$taroParams,
             path: addLeadingSlash(router),
+            $taroPath: page.$taroPath,
             onReady: getOnReadyEventKey(id),
             onShow: getOnShowEventKey(id),
             onHide: getOnHideEventKey(id)
@@ -4499,16 +4501,15 @@ function createPageConfig(component, pageName, data, pageConfig) {
             perf.start(PAGE_INIT);
             Current.page = this;
             this.config = pageConfig || {};
-            options.$taroTimestamp = Date.now();
-            // this.$taroPath 是页面唯一标识，不可变，因此页面参数 options 也不可变
-            this.$taroPath = getPath(id, options);
-            const $taroPath = this.$taroPath;
+            // this.$taroPath 是页面唯一标识
+            const uniqueOptions = Object.assign({}, options, { $taroTimestamp: Date.now() });
+            const $taroPath = this.$taroPath = getPath(id, uniqueOptions);
             if (process.env.TARO_ENV === 'h5') {
-                config.path = this.$taroPath;
+                config.path = $taroPath;
             }
             // this.$taroParams 作为暴露给开发者的页面参数对象，可以被随意修改
             if (this.$taroParams == null) {
-                this.$taroParams = Object.assign({}, options);
+                this.$taroParams = uniqueOptions;
             }
             setCurrentRouter(this);
             const mount = () => {
@@ -4696,12 +4697,6 @@ function createRecursiveComponentConfig(componentName) {
         } }, lifeCycles);
 }
 
-function removeLeadingSlash(path) {
-    if (path == null) {
-        return '';
-    }
-    return path.charAt(0) === '/' ? path.slice(1) : path;
-}
 const nextTick = (cb, ctx) => {
     var _a, _b, _c;
     const router = Current.router;
@@ -4712,7 +4707,7 @@ const nextTick = (cb, ctx) => {
     };
     if (router !== null) {
         let pageElement = null;
-        const path = getPath(removeLeadingSlash(router.path), router.params);
+        const path = router.$taroPath;
         pageElement = document$1.getElementById(path);
         if (pageElement === null || pageElement === void 0 ? void 0 : pageElement.pendingUpdate) {
             if (process.env.TARO_ENV === 'h5') {