@tarojs/taro-h5 4.1.12-beta.4 → 4.1.12-beta.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -65,7 +65,14 @@ const onThemeChange = callback => {
65
65
  if (isNil(themeMatchMedia)) {
66
66
  themeMatchMedia = window.matchMedia('(prefers-color-scheme: light)');
67
67
  }
68
- themeMatchMedia.addEventListener('change', themeChangeListener);
68
+ // 兼容 iOS 13 等旧环境中 MediaQueryList 未继承 EventTarget,仅有 addListener;极端环境可能两者皆无则不再添加
69
+ const mql = themeMatchMedia;
70
+ if (typeof mql.addEventListener === 'function') {
71
+ mql.addEventListener('change', themeChangeListener);
72
+ }
73
+ else if (typeof mql.addListener === 'function') {
74
+ mql.addListener(themeChangeListener);
75
+ }
69
76
  }
70
77
  };
71
78
  const onPageNotFound = callback => {
@@ -103,11 +110,14 @@ const offUnhandledRejection = callback => {
103
110
  };
104
111
  const offThemeChange = callback => {
105
112
  themeChangeCallbackManager.remove(callback);
106
- if (themeChangeCallbackManager.count() === 0) {
107
- if (isNil(themeMatchMedia)) {
108
- themeMatchMedia = window.matchMedia('(prefers-color-scheme: light)');
113
+ if (themeChangeCallbackManager.count() === 0 && themeMatchMedia) {
114
+ // 兼容 iOS 13 等旧环境中 MediaQueryList 未继承 EventTarget,仅有 removeListener;两者皆无时仅置空避免报错
115
+ if (typeof themeMatchMedia.removeEventListener === 'function') {
116
+ themeMatchMedia.removeEventListener('change', themeChangeListener);
117
+ }
118
+ else if (typeof themeMatchMedia.removeListener === 'function') {
119
+ themeMatchMedia.removeListener(themeChangeListener);
109
120
  }
110
- themeMatchMedia.removeEventListener('change', themeChangeListener);
111
121
  themeMatchMedia = null;
112
122
  }
113
123
  };
@@ -1 +1 @@
1
- {"version":3,"file":"app-event.js","sources":["../../../../src/api/base/weapp/app-event.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app-event.js","sources":["../../../../src/api/base/weapp/app-event.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AAOA,MAAM,iCAAiC,GAAG,IAAI,eAAe,EAAsC,CAAA;AACnG,MAAM,0BAA0B,GAAG,IAAI,eAAe,EAA+B,CAAA;AACrF,MAAM,2BAA2B,GAAG,IAAI,eAAe,EAAgC,CAAA;AACvF,MAAM,oBAAoB,GAAG,IAAI,eAAe,EAAqC,CAAA;AACrF,MAAM,sBAAsB,GAAG,IAAI,eAAe,EAAmC,CAAA;AACrF,MAAM,sBAAsB,GAAG,IAAI,eAAe,EAAmC,CAAA;AAErF,MAAM,0BAA0B,GAAG,CAAC,GAA0B,KAAI;AAChE,IAAA,iCAAiC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;AAChD,CAAC,CAAA;AAED,IAAI,eAAe,GAA0B,IAAI,CAAA;AACjD,MAAM,mBAAmB,GAAG,CAAC,GAAwB,KAAI;IACvD,0BAA0B,CAAC,OAAO,CAAC;QACjC,KAAK,EAAE,GAAG,CAAC,OAAO,GAAG,OAAO,GAAG,MAAM;AACtC,KAAA,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAAC,GAA+B,KAAI;AAC/D,IAAA,2BAA2B,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;AAC1C,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,CAAC,GAAe,KAAI;;AAExC,IAAA,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,CAAA;AAC/D,CAAC,CAAA;AAED,MAAM,MAAM,GAAG,MAAK;;IAClB,MAAM,IAAI,GAAG,CAAA,EAAA,GAAA,IAAI,CAAC,OAAO,CAAC,IAAI,MAAE,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAA,IAAI,CAAA;IACpC,OAAO;;QAEL,IAAI,EAAE,CAAA,IAAI,KAAA,IAAA,IAAJ,IAAI,KAAJ,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,IAAI,CAAE,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAI,EAAE;;QAEjD,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;;AAEzC,QAAA,YAAY,EAAE,EAAE;;AAEhB,QAAA,KAAK,EAAE,CAAC;;AAER,QAAA,WAAW,EAAE,EAAE;KAChB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,MAAK;AAC3B,IAAA,IAAI,QAAQ,CAAC,eAAe,KAAK,QAAQ,EAAE;AACzC,QAAA,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;KACzC;AACH,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,MAAK;AAC3B,IAAA,IAAI,QAAQ,CAAC,eAAe,KAAK,QAAQ,EAAE;AACzC,QAAA,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;KACzC;AACH,CAAC,CAAA;AAED;AACa,MAAA,oBAAoB,GAAqC,QAAQ,IAAG;AAC/E,IAAA,iCAAiC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAC/C,IAAA,IAAI,iCAAiC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;AACnD,QAAA,MAAM,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,0BAA0B,CAAC,CAAA;KAC1E;AACH,EAAC;AAEY,MAAA,aAAa,GAA8B,QAAQ,IAAG;AACjE,IAAA,0BAA0B,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AACxC,IAAA,IAAI,0BAA0B,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;AAC5C,QAAA,IAAI,KAAK,CAAC,eAAe,CAAC,EAAE;AAC1B,YAAA,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,+BAA+B,CAAC,CAAA;SACrE;;QAED,MAAM,GAAG,GAAG,eAAgB,CAAA;AAC5B,QAAA,IAAI,OAAO,GAAG,CAAC,gBAAgB,KAAK,UAAU,EAAE;AAC9C,YAAA,GAAG,CAAC,gBAAgB,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAA;SACpD;AAAM,aAAA,IAAI,OAAQ,GAAW,CAAC,WAAW,KAAK,UAAU,EAAE;AACxD,YAAA,GAAW,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAA;SAC9C;KACF;AACH,EAAC;AAEY,MAAA,cAAc,GAA+B,QAAQ,IAAG;AACnE,IAAA,2BAA2B,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AACzC,IAAA,IAAI,2BAA2B,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;QAC7C,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAAA;KAClE;AACH,EAAC;AAEY,MAAA,eAAe,mBAAmB,qBAAqB,CAAC,iBAAiB,EAAC;AAE1E,MAAA,OAAO,GAAwB,QAAQ,IAAG;AACrD,IAAA,oBAAoB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AAClC,IAAA,IAAI,oBAAoB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;AACtC,QAAA,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;KAChD;AACH,EAAC;AAEY,MAAA,sBAAsB,mBAAmB,qBAAqB,CAAC,wBAAwB,EAAC;AACxF,MAAA,wBAAwB,mBAAmB,qBAAqB,CAAC,0BAA0B,EAAC;AAE5F,MAAA,SAAS,GAA0B,QAAQ,IAAG;AACzD,IAAA,sBAAsB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AACpC,IAAA,IAAI,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;AACxC,QAAA,MAAM,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAA;KAC7D;AACH,EAAC;AAEY,MAAA,SAAS,GAA0B,QAAQ,IAAG;AACzD,IAAA,sBAAsB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;AACpC,IAAA,IAAI,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;AACxC,QAAA,MAAM,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAA;KAC7D;AACH,EAAC;AAEY,MAAA,qBAAqB,GAAsC,QAAQ,IAAG;AACjF,IAAA,iCAAiC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;AAClD,IAAA,IAAI,iCAAiC,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;AACnD,QAAA,MAAM,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,0BAA0B,CAAC,CAAA;KAC7E;AACH,EAAC;AAEY,MAAA,cAAc,GAA+B,QAAQ,IAAG;AACnE,IAAA,0BAA0B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC3C,IAAI,0BAA0B,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,eAAe,EAAE;;AAE/D,QAAA,IAAI,OAAO,eAAe,CAAC,mBAAmB,KAAK,UAAU,EAAE;AAC7D,YAAA,eAAe,CAAC,mBAAmB,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAA;SACnE;AAAM,aAAA,IAAI,OAAQ,eAAuB,CAAC,cAAc,KAAK,UAAU,EAAE;AACvE,YAAA,eAAuB,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAA;SAC7D;QACD,eAAe,GAAG,IAAI,CAAA;KACvB;AACH,EAAC;AAEY,MAAA,eAAe,GAAgC,QAAQ,IAAG;AACrE,IAAA,2BAA2B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;AAC5C,IAAA,IAAI,2BAA2B,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;QAC7C,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAAA;KACnE;AACH,EAAC;AAEY,MAAA,gBAAgB,mBAAmB,qBAAqB,CAAC,kBAAkB,EAAC;AAE5E,MAAA,QAAQ,GAAyB,QAAQ,IAAG;AACvD,IAAA,oBAAoB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;AACrC,IAAA,IAAI,oBAAoB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;AACtC,QAAA,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;KACnD;AACH,EAAC;AAEY,MAAA,uBAAuB,mBAAmB,qBAAqB,CAAC,yBAAyB,EAAC;AAC1F,MAAA,yBAAyB,mBAAmB,qBAAqB,CAAC,2BAA2B,EAAC;AAE9F,MAAA,UAAU,GAA2B,QAAQ,IAAG;AAC3D,IAAA,sBAAsB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;AACvC,IAAA,IAAI,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;AACxC,QAAA,MAAM,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAA;KAChE;AACH,EAAC;AAEY,MAAA,UAAU,GAA2B,QAAQ,IAAG;AAC3D,IAAA,sBAAsB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;AACvC,IAAA,IAAI,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;AACxC,QAAA,MAAM,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAA;KAChE;AACH;;;;"}
@@ -23,7 +23,9 @@ document.addEventListener('copy', () => {
23
23
  /**
24
24
  * 设置系统剪贴板的内容
25
25
  */
26
- const setClipboardData = (_a) => __awaiter(void 0, [_a], void 0, function* ({ data, success, fail, complete }) {
26
+ const setClipboardData = (_a) => __awaiter(void 0, [_a], void 0, function* ({ data, options, success, fail, complete }) {
27
+ var _b;
28
+ const hideDefaultMessage = (_b = options === null || options === void 0 ? void 0 : options.hideDefaultMessage) !== null && _b !== void 0 ? _b : false;
27
29
  const handle = new MethodHandler({ name: 'setClipboardData', success, fail, complete });
28
30
  try {
29
31
  setStorageSync(CLIPBOARD_STORAGE_NAME, data);
@@ -48,11 +50,13 @@ const setClipboardData = (_a) => __awaiter(void 0, [_a], void 0, function* ({ da
48
50
  else {
49
51
  throw new Error('Unsupported Function: \'document.execCommand\'.');
50
52
  }
51
- showToast({
52
- title: '内容已复制',
53
- icon: 'none',
54
- duration: 1500
55
- });
53
+ if (!hideDefaultMessage) {
54
+ showToast({
55
+ title: '内容已复制',
56
+ icon: 'none',
57
+ duration: 1500
58
+ });
59
+ }
56
60
  return handle.success();
57
61
  }
58
62
  catch (e) {
@@ -1 +1 @@
1
- {"version":3,"file":"clipboard.js","sources":["../../../src/api/device/clipboard.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"clipboard.js","sources":["../../../src/api/device/clipboard.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
@@ -1 +1,14 @@
1
- export declare const createMapContext: (option?: {}, ...args: any[]) => Promise<Partial<TaroGeneral.CallbackResult> & Record<string, unknown> & TaroGeneral.CallbackResult>;
1
+ /// <reference types="types/api" />
2
+ import Taro from '@tarojs/api';
3
+ /**
4
+ * 创建地图上下文 MapContext 对象
5
+ *
6
+ * @param mapId Map 组件的 id
7
+ * @param _inst 自定义组件实例(暂未使用)
8
+ * @param type Map 组件类型:'react' 新 Map (components-react,默认),'legacy' 老 Map (components)
9
+ * @returns MapContext 实例
10
+ *
11
+ * 新 Map (components-react):通过 window.__TARO_MAP_CONTEXTS__ 获取 MapContextImpl 实例
12
+ * 老 Map (components):暂不支持,后续实现
13
+ */
14
+ export declare function createMapContext(mapId: string, _inst?: any, type?: 'legacy' | 'react'): Taro.MapContext;
@@ -1,7 +1,77 @@
1
1
  import { temporarilyNotSupport } from '../../utils/index.js';
2
2
 
3
- // 地图
4
- const createMapContext = /* @__PURE__ */ temporarilyNotSupport('createMapContext');
3
+ /**
4
+ * 创建地图上下文 MapContext 对象
5
+ *
6
+ * @param mapId Map 组件的 id
7
+ * @param _inst 自定义组件实例(暂未使用)
8
+ * @param type Map 组件类型:'react' 新 Map (components-react,默认),'legacy' 老 Map (components)
9
+ * @returns MapContext 实例
10
+ *
11
+ * 新 Map (components-react):通过 window.__TARO_MAP_CONTEXTS__ 获取 MapContextImpl 实例
12
+ * 老 Map (components):暂不支持,后续实现
13
+ */
14
+ function createMapContext(mapId, _inst, type) {
15
+ var _a;
16
+ // 默认为新 Map (react)
17
+ const mapType = type !== null && type !== void 0 ? type : 'react';
18
+ // 老 Map:暂不支持
19
+ if (mapType === 'legacy') {
20
+ console.warn('[createMapContext] legacy Map (taro-components) 暂不支持 createMapContext');
21
+ return temporarilyNotSupport('createMapContext')(mapId, _inst);
22
+ }
23
+ // 新 Map:从 window 获取 MapContextImpl 实例
24
+ const contextImpl = (_a = window.__TARO_MAP_CONTEXTS__) === null || _a === void 0 ? void 0 : _a.get(mapId);
25
+ if (!contextImpl) {
26
+ console.warn(`[createMapContext] 找不到 id 为 "${mapId}" 的地图上下文`);
27
+ console.warn('[createMapContext] 请确保:1) Map 组件已正确设置 id 属性;2) 地图已完成初始化');
28
+ // 返回一个空实现,避免运行时错误
29
+ return createDummyContext();
30
+ }
31
+ console.log('[createMapContext] 成功获取地图上下文:', mapId);
32
+ return contextImpl;
33
+ }
34
+ /**
35
+ * 创建空实现(当找不到地图实例时)
36
+ * 避免业务代码调用时出现运行时错误
37
+ */
38
+ function createDummyContext() {
39
+ console.warn('[createDummyContext] 返回空 MapContext 实现');
40
+ return {
41
+ includePoints: () => Promise.reject(new Error('地图实例不存在')),
42
+ getCenterLocation: () => Promise.reject(new Error('地图实例不存在')),
43
+ setLocMarkerIcon: () => Promise.reject(new Error('地图实例不存在')),
44
+ moveToLocation: () => Promise.reject(new Error('地图实例不存在')),
45
+ translateMarker: () => Promise.reject(new Error('地图实例不存在')),
46
+ moveAlong: () => {
47
+ console.warn('[MapContext] moveAlong: 地图实例不存在');
48
+ },
49
+ getRegion: () => Promise.reject(new Error('地图实例不存在')),
50
+ getRotate: () => Promise.reject(new Error('地图实例不存在')),
51
+ getSkew: () => Promise.reject(new Error('地图实例不存在')),
52
+ getScale: () => Promise.reject(new Error('地图实例不存在')),
53
+ setCenterOffset: () => Promise.reject(new Error('地图实例不存在')),
54
+ removeCustomLayer: () => Promise.reject(new Error('地图实例不存在')),
55
+ addCustomLayer: () => Promise.reject(new Error('地图实例不存在')),
56
+ addGroundOverlay: () => Promise.reject(new Error('地图实例不存在')),
57
+ addVisualLayer: () => Promise.reject(new Error('地图实例不存在')),
58
+ removeVisualLayer: () => Promise.reject(new Error('地图实例不存在')),
59
+ addArc: () => Promise.reject(new Error('地图实例不存在')),
60
+ removeArc: () => Promise.reject(new Error('地图实例不存在')),
61
+ setBoundary: () => Promise.reject(new Error('地图实例不存在')),
62
+ updateGroundOverlay: () => Promise.reject(new Error('地图实例不存在')),
63
+ removeGroundOverlay: () => Promise.reject(new Error('地图实例不存在')),
64
+ toScreenLocation: () => Promise.reject(new Error('地图实例不存在')),
65
+ fromScreenLocation: () => Promise.reject(new Error('地图实例不存在')),
66
+ openMapApp: () => Promise.reject(new Error('地图实例不存在')),
67
+ addMarkers: () => Promise.reject(new Error('地图实例不存在')),
68
+ removeMarkers: () => Promise.reject(new Error('地图实例不存在')),
69
+ initMarkerCluster: () => Promise.reject(new Error('地图实例不存在')),
70
+ on: (_event, _callback) => {
71
+ console.warn('[MapContext] on: 地图实例不存在');
72
+ },
73
+ };
74
+ }
5
75
 
6
76
  export { createMapContext };
7
77
  //# sourceMappingURL=map.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"map.js","sources":["../../../src/api/media/map.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAEA;AACa,MAAA,gBAAgB,mBAAmB,qBAAqB,CAAC,kBAAkB;;;;"}
1
+ {"version":3,"file":"map.js","sources":["../../../src/api/media/map.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
@@ -14,7 +14,7 @@ declare const initPxTransform: ({ designWidth, deviceRatio, baseFontSize, unitPr
14
14
  unitPrecision?: number | undefined;
15
15
  targetUnit?: string | undefined;
16
16
  }) => void;
17
- declare const pxTransform: (size?: number) => any;
17
+ declare const pxTransform: (size?: number, designWid?: number) => any;
18
18
  declare const canIUseWebp: () => boolean;
19
19
  declare const getAppInfo: () => {
20
20
  platform: string;
package/dist/api/taro.js CHANGED
@@ -59,14 +59,14 @@ const initPxTransform = function ({ designWidth = defaultDesignWidth, deviceRati
59
59
  config.targetUnit = targetUnit;
60
60
  config.unitPrecision = unitPrecision;
61
61
  };
62
- const pxTransform = function (size = 0) {
62
+ const pxTransform = function (size = 0, designWid) {
63
63
  const config = getConfig.call(this);
64
64
  const baseFontSize = config.baseFontSize || defaultBaseFontSize;
65
65
  const deviceRatio = config.deviceRatio || defaultDesignRatio;
66
- const designWidth = ((input = 0) => isFunction(config.designWidth)
66
+ const designWidth = designWid || ((input = 0) => isFunction(config.designWidth)
67
67
  ? config.designWidth(input)
68
68
  : config.designWidth)(size);
69
- if (!(designWidth in config.deviceRatio)) {
69
+ if (!(designWidth in deviceRatio)) {
70
70
  throw new Error(`deviceRatio 配置中不存在 ${designWidth} 的设置!`);
71
71
  }
72
72
  const targetUnit = config.targetUnit || defaultTargetUnit;
@@ -1 +1 @@
1
- {"version":3,"file":"taro.js","sources":["../../src/api/taro.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"taro.js","sources":["../../src/api/taro.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
@@ -32,6 +32,7 @@ class TaroH5IntersectionObserver {
32
32
  return new IntersectionObserver(entries => {
33
33
  entries.forEach(entry => {
34
34
  const _callback = this._getCallbackByElement(entry.target);
35
+ const target = entry.target;
35
36
  const result = {
36
37
  boundingClientRect: entry.boundingClientRect,
37
38
  intersectionRatio: entry.intersectionRatio,
@@ -39,6 +40,8 @@ class TaroH5IntersectionObserver {
39
40
  relativeRect: entry.rootBounds || { left: 0, right: 0, top: 0, bottom: 0 },
40
41
  // 使用时间戳而不是entry.time,跟微信小程序一致
41
42
  time: Date.now(),
43
+ id: target.id || undefined,
44
+ dataset: 'dataset' in target ? target.dataset : undefined,
42
45
  };
43
46
  // web端会默认首次触发
44
47
  if (!this._isInited) {
@@ -1 +1 @@
1
- {"version":3,"file":"IntersectionObserver.js","sources":["../../../src/api/wxml/IntersectionObserver.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"IntersectionObserver.js","sources":["../../../src/api/wxml/IntersectionObserver.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
package/dist/index.cjs.js CHANGED
@@ -608,7 +608,14 @@ const onThemeChange = callback => {
608
608
  if (isNil(themeMatchMedia)) {
609
609
  themeMatchMedia = window.matchMedia('(prefers-color-scheme: light)');
610
610
  }
611
- themeMatchMedia.addEventListener('change', themeChangeListener);
611
+ // 兼容 iOS 13 等旧环境中 MediaQueryList 未继承 EventTarget,仅有 addListener;极端环境可能两者皆无则不再添加
612
+ const mql = themeMatchMedia;
613
+ if (typeof mql.addEventListener === 'function') {
614
+ mql.addEventListener('change', themeChangeListener);
615
+ }
616
+ else if (typeof mql.addListener === 'function') {
617
+ mql.addListener(themeChangeListener);
618
+ }
612
619
  }
613
620
  };
614
621
  const onPageNotFound = callback => {
@@ -646,11 +653,14 @@ const offUnhandledRejection = callback => {
646
653
  };
647
654
  const offThemeChange = callback => {
648
655
  themeChangeCallbackManager.remove(callback);
649
- if (themeChangeCallbackManager.count() === 0) {
650
- if (isNil(themeMatchMedia)) {
651
- themeMatchMedia = window.matchMedia('(prefers-color-scheme: light)');
656
+ if (themeChangeCallbackManager.count() === 0 && themeMatchMedia) {
657
+ // 兼容 iOS 13 等旧环境中 MediaQueryList 未继承 EventTarget,仅有 removeListener;两者皆无时仅置空避免报错
658
+ if (typeof themeMatchMedia.removeEventListener === 'function') {
659
+ themeMatchMedia.removeEventListener('change', themeChangeListener);
660
+ }
661
+ else if (typeof themeMatchMedia.removeListener === 'function') {
662
+ themeMatchMedia.removeListener(themeChangeListener);
652
663
  }
653
- themeMatchMedia.removeEventListener('change', themeChangeListener);
654
664
  themeMatchMedia = null;
655
665
  }
656
666
  };
@@ -2359,7 +2369,9 @@ document.addEventListener('copy', () => {
2359
2369
  /**
2360
2370
  * 设置系统剪贴板的内容
2361
2371
  */
2362
- const setClipboardData = (_a) => tslib.__awaiter(void 0, [_a], void 0, function* ({ data, success, fail, complete }) {
2372
+ const setClipboardData = (_a) => tslib.__awaiter(void 0, [_a], void 0, function* ({ data, options, success, fail, complete }) {
2373
+ var _b;
2374
+ const hideDefaultMessage = (_b = options === null || options === void 0 ? void 0 : options.hideDefaultMessage) !== null && _b !== void 0 ? _b : false;
2363
2375
  const handle = new MethodHandler({ name: 'setClipboardData', success, fail, complete });
2364
2376
  try {
2365
2377
  setStorageSync(CLIPBOARD_STORAGE_NAME, data);
@@ -2384,11 +2396,13 @@ const setClipboardData = (_a) => tslib.__awaiter(void 0, [_a], void 0, function*
2384
2396
  else {
2385
2397
  throw new Error('Unsupported Function: \'document.execCommand\'.');
2386
2398
  }
2387
- showToast({
2388
- title: '内容已复制',
2389
- icon: 'none',
2390
- duration: 1500
2391
- });
2399
+ if (!hideDefaultMessage) {
2400
+ showToast({
2401
+ title: '内容已复制',
2402
+ icon: 'none',
2403
+ duration: 1500
2404
+ });
2405
+ }
2392
2406
  return handle.success();
2393
2407
  }
2394
2408
  catch (e) {
@@ -4620,8 +4634,78 @@ const cropImage = /* @__PURE__ */ temporarilyNotSupport('cropImage');
4620
4634
  const createLivePusherContext = /* @__PURE__ */ temporarilyNotSupport('createLivePusherContext');
4621
4635
  const createLivePlayerContext = /* @__PURE__ */ temporarilyNotSupport('createLivePlayerContext');
4622
4636
 
4623
- // 地图
4624
- const createMapContext = /* @__PURE__ */ temporarilyNotSupport('createMapContext');
4637
+ /**
4638
+ * 创建地图上下文 MapContext 对象
4639
+ *
4640
+ * @param mapId Map 组件的 id
4641
+ * @param _inst 自定义组件实例(暂未使用)
4642
+ * @param type Map 组件类型:'react' 新 Map (components-react,默认),'legacy' 老 Map (components)
4643
+ * @returns MapContext 实例
4644
+ *
4645
+ * 新 Map (components-react):通过 window.__TARO_MAP_CONTEXTS__ 获取 MapContextImpl 实例
4646
+ * 老 Map (components):暂不支持,后续实现
4647
+ */
4648
+ function createMapContext(mapId, _inst, type) {
4649
+ var _a;
4650
+ // 默认为新 Map (react)
4651
+ const mapType = type !== null && type !== void 0 ? type : 'react';
4652
+ // 老 Map:暂不支持
4653
+ if (mapType === 'legacy') {
4654
+ console.warn('[createMapContext] legacy Map (taro-components) 暂不支持 createMapContext');
4655
+ return temporarilyNotSupport('createMapContext')(mapId, _inst);
4656
+ }
4657
+ // 新 Map:从 window 获取 MapContextImpl 实例
4658
+ const contextImpl = (_a = window.__TARO_MAP_CONTEXTS__) === null || _a === void 0 ? void 0 : _a.get(mapId);
4659
+ if (!contextImpl) {
4660
+ console.warn(`[createMapContext] 找不到 id 为 "${mapId}" 的地图上下文`);
4661
+ console.warn('[createMapContext] 请确保:1) Map 组件已正确设置 id 属性;2) 地图已完成初始化');
4662
+ // 返回一个空实现,避免运行时错误
4663
+ return createDummyContext();
4664
+ }
4665
+ console.log('[createMapContext] 成功获取地图上下文:', mapId);
4666
+ return contextImpl;
4667
+ }
4668
+ /**
4669
+ * 创建空实现(当找不到地图实例时)
4670
+ * 避免业务代码调用时出现运行时错误
4671
+ */
4672
+ function createDummyContext() {
4673
+ console.warn('[createDummyContext] 返回空 MapContext 实现');
4674
+ return {
4675
+ includePoints: () => Promise.reject(new Error('地图实例不存在')),
4676
+ getCenterLocation: () => Promise.reject(new Error('地图实例不存在')),
4677
+ setLocMarkerIcon: () => Promise.reject(new Error('地图实例不存在')),
4678
+ moveToLocation: () => Promise.reject(new Error('地图实例不存在')),
4679
+ translateMarker: () => Promise.reject(new Error('地图实例不存在')),
4680
+ moveAlong: () => {
4681
+ console.warn('[MapContext] moveAlong: 地图实例不存在');
4682
+ },
4683
+ getRegion: () => Promise.reject(new Error('地图实例不存在')),
4684
+ getRotate: () => Promise.reject(new Error('地图实例不存在')),
4685
+ getSkew: () => Promise.reject(new Error('地图实例不存在')),
4686
+ getScale: () => Promise.reject(new Error('地图实例不存在')),
4687
+ setCenterOffset: () => Promise.reject(new Error('地图实例不存在')),
4688
+ removeCustomLayer: () => Promise.reject(new Error('地图实例不存在')),
4689
+ addCustomLayer: () => Promise.reject(new Error('地图实例不存在')),
4690
+ addGroundOverlay: () => Promise.reject(new Error('地图实例不存在')),
4691
+ addVisualLayer: () => Promise.reject(new Error('地图实例不存在')),
4692
+ removeVisualLayer: () => Promise.reject(new Error('地图实例不存在')),
4693
+ addArc: () => Promise.reject(new Error('地图实例不存在')),
4694
+ removeArc: () => Promise.reject(new Error('地图实例不存在')),
4695
+ setBoundary: () => Promise.reject(new Error('地图实例不存在')),
4696
+ updateGroundOverlay: () => Promise.reject(new Error('地图实例不存在')),
4697
+ removeGroundOverlay: () => Promise.reject(new Error('地图实例不存在')),
4698
+ toScreenLocation: () => Promise.reject(new Error('地图实例不存在')),
4699
+ fromScreenLocation: () => Promise.reject(new Error('地图实例不存在')),
4700
+ openMapApp: () => Promise.reject(new Error('地图实例不存在')),
4701
+ addMarkers: () => Promise.reject(new Error('地图实例不存在')),
4702
+ removeMarkers: () => Promise.reject(new Error('地图实例不存在')),
4703
+ initMarkerCluster: () => Promise.reject(new Error('地图实例不存在')),
4704
+ on: (_event, _callback) => {
4705
+ console.warn('[MapContext] on: 地图实例不存在');
4706
+ },
4707
+ };
4708
+ }
4625
4709
 
4626
4710
  // 画面录制器
4627
4711
  const createMediaRecorder = /* @__PURE__ */ temporarilyNotSupport('createMediaRecorder');
@@ -5659,6 +5743,7 @@ class TaroH5IntersectionObserver {
5659
5743
  return new IntersectionObserver(entries => {
5660
5744
  entries.forEach(entry => {
5661
5745
  const _callback = this._getCallbackByElement(entry.target);
5746
+ const target = entry.target;
5662
5747
  const result = {
5663
5748
  boundingClientRect: entry.boundingClientRect,
5664
5749
  intersectionRatio: entry.intersectionRatio,
@@ -5666,6 +5751,8 @@ class TaroH5IntersectionObserver {
5666
5751
  relativeRect: entry.rootBounds || { left: 0, right: 0, top: 0, bottom: 0 },
5667
5752
  // 使用时间戳而不是entry.time,跟微信小程序一致
5668
5753
  time: Date.now(),
5754
+ id: target.id || undefined,
5755
+ dataset: 'dataset' in target ? target.dataset : undefined,
5669
5756
  };
5670
5757
  // web端会默认首次触发
5671
5758
  if (!this._isInited) {
@@ -6099,14 +6186,14 @@ const initPxTransform = function ({ designWidth = defaultDesignWidth, deviceRati
6099
6186
  config.targetUnit = targetUnit;
6100
6187
  config.unitPrecision = unitPrecision;
6101
6188
  };
6102
- const pxTransform = function (size = 0) {
6189
+ const pxTransform = function (size = 0, designWid) {
6103
6190
  const config = getConfig.call(this);
6104
6191
  const baseFontSize = config.baseFontSize || defaultBaseFontSize;
6105
6192
  const deviceRatio = config.deviceRatio || defaultDesignRatio;
6106
- const designWidth = ((input = 0) => shared.isFunction(config.designWidth)
6193
+ const designWidth = designWid || ((input = 0) => shared.isFunction(config.designWidth)
6107
6194
  ? config.designWidth(input)
6108
6195
  : config.designWidth)(size);
6109
- if (!(designWidth in config.deviceRatio)) {
6196
+ if (!(designWidth in deviceRatio)) {
6110
6197
  throw new Error(`deviceRatio 配置中不存在 ${designWidth} 的设置!`);
6111
6198
  }
6112
6199
  const targetUnit = config.targetUnit || defaultTargetUnit;