@doubao-apps/taro-runtime 0.0.23 → 0.0.24

package/dist/api/index.d.ts

@@ -1,6 +1,6 @@
 export { getEnv, ENV_TYPE } from './base/index.js';
 export { request } from './request/index.js';
-export { exitMiniProgram, navigateBack, navigateTo, reLaunch, redirectTo } from './router/index.js';
+export { exitMiniProgram, navigateBack, navigateTo, getCurrentPages, reLaunch, redirectTo } from './router/index.js';
 export { setStorage, setStorageSync, getStorage, getStorageSync, removeStorage, removeStorageSync, clearStorage, clearStorageSync, getStorageInfo, getStorageInfoSync } from './storage/index.js';
 export { getSystemSetting, getAppAuthorizeSetting, getDeviceInfo, getAppBaseInfo, getWindowInfo, makePhoneCall, getNetworkType, onKeyboardHeightChange } from './system/index.js';
 export { getLocation } from './location/index.js';

package/dist/api/index.js

@@ -1,6 +1,6 @@
 export { getEnv, ENV_TYPE } from './base/index.js';
 export { request } from './request/index.js';
-export { exitMiniProgram, navigateBack, navigateTo, reLaunch, redirectTo } from './router/index.js';
+export { exitMiniProgram, navigateBack, navigateTo, getCurrentPages, reLaunch, redirectTo } from './router/index.js';
 export { setStorage, setStorageSync, getStorage, getStorageSync, removeStorage, removeStorageSync, clearStorage, clearStorageSync, getStorageInfo, getStorageInfoSync } from './storage/index.js';
 export { getSystemSetting, getAppAuthorizeSetting, getDeviceInfo, getAppBaseInfo, getWindowInfo, makePhoneCall, getNetworkType, onKeyboardHeightChange } from './system/index.js';
 export { getLocation } from './location/index.js';

package/dist/api/router/get-current-pages.d.ts

@@ -0,0 +1,2 @@
+export declare function getCurrentPages(): Taro.PageInstance[];
+//# sourceMappingURL=get-current-pages.d.ts.map

package/dist/api/router/get-current-pages.js

@@ -0,0 +1,6 @@
+import { getCurrentPages as appGetCurrentPages } from '@byted-doubao-apps/framework';
+export function getCurrentPages() {
+    // @ts-expect-error
+    return appGetCurrentPages();
+}
+//# sourceMappingURL=get-current-pages.js.map

package/dist/api/router/index.d.ts

@@ -1,5 +1,6 @@
 export { exitMiniProgram } from './exit-mini-program.js';
 export { navigateBack } from './navigate-back.js';
+export { getCurrentPages } from './get-current-pages.js';
 export { navigateTo } from './navigate-to.js';
 export { reLaunch } from './re-launch.js';
 export { redirectTo } from './redirect-to.js';

package/dist/api/router/index.js

@@ -1,5 +1,6 @@
 export { exitMiniProgram } from './exit-mini-program.js';
 export { navigateBack } from './navigate-back.js';
+export { getCurrentPages } from './get-current-pages.js';
 export { navigateTo } from './navigate-to.js';
 export { reLaunch } from './re-launch.js';
 export { redirectTo } from './redirect-to.js';

package/dist/components/Map/bridge.d.ts

@@ -75,7 +75,7 @@ export declare function composeMarkers(propMarkers: MapProps.marker[], addedMark
 export declare function mergeMarkersById(base: MapProps.marker[], incoming: MapProps.marker[]): MapProps.marker[];
 export declare function removeMarkersByIds(markers: MapProps.marker[], markerIds: number[]): MapProps.marker[];
 export declare function getNumericMarkerId(marker: MapProps.marker): number | undefined;
-export declare function mapRegionCausedByEnd(causedBy: 'drag' | 'scale', by?: 'user' | 'api'): "scale" | "drag" | "update";
+export declare function mapRegionCausedByEnd(causedBy: 'drag' | 'scale', triggeredBy: 'user' | 'api'): "scale" | "drag" | "update";
 export declare function dispatchMarkerTapEvent<T>(handlers: {
     onMarkerTap?: (event: T) => void;
     onLabelTap?: (event: T) => void;

package/dist/components/Map/bridge.js

@@ -116,9 +116,11 @@ export function mapRegionChangeDetail(detail) {
         southwest: center
     };
     const causedBy = detail.causedBy ?? 'drag';
+    const triggeredBy = detail.triggeredBy ?? 'user';
     const rotate = detail.rotate ?? 0;
     const scale = detail.scale ?? 0;
-    const beginCausedBy = mapRegionCausedByBegin(causedBy, detail.by);
+    const beginCausedBy = mapRegionCausedByBegin(triggeredBy);
+    const endCausedBy = mapRegionCausedByEnd(causedBy, triggeredBy);
     const region = {
         northeast: regionSource.northeast,
         southeast: {
@@ -143,11 +145,11 @@ export function mapRegionChangeDetail(detail) {
     }
     return {
         type: 'end',
-        causedBy: mapRegionCausedByEnd(causedBy, detail.by),
+        causedBy: endCausedBy,
         detail: {
             rotate,
             skew: 0,
-            causedBy: mapRegionCausedByEnd(causedBy, detail.by),
+            causedBy: endCausedBy,
             type: 'end',
             scale,
             centerLocation: center,
@@ -280,14 +282,14 @@ export function removeMarkersByIds(markers, markerIds) {
 export function getNumericMarkerId(marker) {
     return typeof marker.id === 'number' ? marker.id : undefined;
 }
-export function mapRegionCausedByEnd(causedBy, by) {
-    if (by === 'api') {
+export function mapRegionCausedByEnd(causedBy, triggeredBy) {
+    if (triggeredBy === 'api') {
         return 'update';
     }
     return causedBy;
 }
-function mapRegionCausedByBegin(causedBy, by) {
-    if (by === 'api') {
+function mapRegionCausedByBegin(triggeredBy) {
+    if (triggeredBy === 'api') {
         return 'update';
     }
     return 'gesture';

package/dist/components/Map/index.jsx

@@ -1,9 +1,9 @@
-import { useEffect, useRef, useState } from '@byted-doubao-apps/framework';
+import { useEffect, useMemo, useRef, useState } from '@byted-doubao-apps/framework';
 import { registerMapController, unregisterMapController } from '../../internal/map-context/index.js';
 import { Image } from '../Image/index.jsx';
 import { warnUnsupported } from '../base/warn-unsupported.js';
-import { composeMarkers, createMarkerElementProps, dispatchMarkerTapEvent, getNumericMarkerId, hasByClickCallout, hasTapTitle, mapMarkerToNativeProps, mergeMarkersById, removeMarkersByIds, resolveMarkerIconStyle, resolveMarkerTextContent, shouldAutoSizeMarkerIcon, resolvePadding } from './bridge.js';
-import { collectMapUnsupportedWarnings, createMapElementProps, resolveMapValues, toCommonEvent } from './mapping.js';
+import { composeMarkers, createMarkerElementProps, dispatchMarkerTapEvent, getNumericMarkerId, hasByClickCallout, hasTapTitle, mapMarkerToNativeProps, mapPolylineTapDetail, mapRegionChangeDetail, mergeMarkersById, removeMarkersByIds, resolveMarkerIconStyle, resolveNativePolygons, resolveMarkerTextContent, resolvePolylines, shouldAutoSizeMarkerIcon, resolvePadding } from './bridge.js';
+import { collectMapUnsupportedWarnings, mergeMapStyle, resolveNativeCircles, resolveMapValues, toCommonEvent } from './mapping.js';
 function DoubaoAppsMap(props) {
     const { id, className, style, hidden, animation, children, onTouchStart, onTouchMove, onTouchCancel, onTouchEnd, onClick: onBaseClick, onLongPress, onLongClick, onTransitionEnd, onAnimationStart, onAnimationIteration, onAnimationEnd, longitude, latitude, scale, minScale, maxScale, markers, covers, polyline, circles, controls, includePoints, showLocation, polygons, subkey, layerStyle, rotate, skew, showCompass, showScale, enableOverlooking, enableZoom, enableScroll, enableRotate, enableSatellite, enableTraffic, setting, includePadding, groundOverlays, tileOverlay, enablePoi, enableBuilding, polygon, customMapStyle, panels, theme, optimize, enableAutoMaxOverlooking, enable3D, onTap, onMarkerTap, onLabelTap, onControlTap, onCalloutTap, onUpdated, onRegionChange, onPoiTap, onPolylineTap, onAbilitySuccess, onAbilityFailed, onAuthSuccess, onInterpolatePoint, onError, onCallOutTap, onAnchorPointTap, onPanelTap, onInitComplete, ...rest } = props;
     const mapRef = useRef(null);
@@ -12,6 +12,10 @@ function DoubaoAppsMap(props) {
     const [activeCalloutMarkerId, setActiveCalloutMarkerId] = useState(undefined);
     const [imperativeAddedMarkers, setImperativeAddedMarkers] = useState([]);
     const [imperativeRemovedMarkerIds, setImperativeRemovedMarkerIds] = useState([]);
+    const resolvedCenter = useMemo(() => ({
+        latitude,
+        longitude
+    }), [latitude, longitude]);
     const { resolvedSetting, resolvedScale, resolvedMinScale, resolvedMaxScale, resolvedRotate, resolvedShowScale, resolvedEnableTilt, resolvedEnableScale, resolvedEnableDrag, resolvedEnableRotate, resolvedMarkers, resolvedPolygons, resolvedMapStyle } = resolveMapValues({
         setting,
         scale,
@@ -114,34 +118,6 @@ function DoubaoAppsMap(props) {
             unregisterMapController(mapId, controller);
         };
     }, [mapId]);
-    const mapElementProps = createMapElementProps({
-        mapId,
-        className,
-        mapRef,
-        style,
-        hidden,
-        latitude,
-        longitude,
-        resolvedMapStyle,
-        resolvedScale,
-        resolvedMinScale,
-        resolvedMaxScale,
-        resolvedRotate,
-        resolvedShowScale,
-        resolvedEnableTilt,
-        resolvedEnableScale,
-        resolvedEnableDrag,
-        resolvedEnableRotate,
-        polyline,
-        circles,
-        resolvedPolygons,
-        onTap,
-        onBaseClick,
-        onUpdated,
-        onInitComplete,
-        onRegionChange,
-        onPolylineTap
-    });
     const markerTapHandlers = {
         onMarkerTap,
         onLabelTap,
@@ -153,7 +129,23 @@ function DoubaoAppsMap(props) {
         onCalloutTap !== undefined ||
         onCallOutTap !== undefined;
     const renderMarkers = composeMarkers(resolvedMarkers, imperativeAddedMarkers, imperativeRemovedMarkerIds);
-    return (<map {...mapElementProps}>
+    return (<map className={className || ''} ref={mapRef} style={mergeMapStyle(style, hidden)} 
+    // @ts-expect-error
+    enableNativeInteraction={rest.enableNativeInteraction} mapStyle={resolvedMapStyle} 
+    // @ts-ignore
+    center={longitude !== undefined && latitude !== undefined ? resolvedCenter : undefined} scale={resolvedScale} minScale={resolvedMinScale} maxScale={resolvedMaxScale} rotate={resolvedRotate} showScale={resolvedShowScale} enableTilt={resolvedEnableTilt} enableScale={resolvedEnableScale} enableDrag={resolvedEnableDrag} enableRotate={resolvedEnableRotate} polyline={resolvePolylines(polyline)} circles={resolveNativeCircles(circles)} polygons={resolveNativePolygons(resolvedPolygons)} onClick={(detail) => {
+            const event = toCommonEvent({ point: detail.point }, 'tap', mapId);
+            onTap?.(event);
+            onBaseClick?.(event);
+        }} onMapLoaded={() => {
+            const event = toCommonEvent(undefined, 'updated', mapId);
+            onUpdated?.(event);
+            onInitComplete?.(event);
+        }} onRegionChange={(detail) => {
+            onRegionChange?.(toCommonEvent(mapRegionChangeDetail(detail), 'regionchange', mapId));
+        }} onPolylineClick={(detail) => {
+            onPolylineTap?.(toCommonEvent(mapPolylineTapDetail(detail), 'polylinetap', mapId));
+        }}>
       {renderMarkers.map((marker, index) => {
             const nativeMarker = mapMarkerToNativeProps(marker, index);
             const markerId = nativeMarker.markerId;

package/dist/components/Map/mapping.d.ts

@@ -1,5 +1,3 @@
-import type { MapRef } from '@byted-doubao-apps/framework/components';
-import type { MapProps as ComponentMapProps } from '@byted-doubao-apps/components';
 import type { CSSProperties } from '@lynx-js/types';
 import type { MapProps } from '@tarojs/components';
 import { resolveCustomMapStyle } from './bridge.js';
@@ -20,9 +18,6 @@ type CommonEvent<T = unknown> = {
     preventDefault: () => void;
     stopPropagation: () => void;
 };
-type NativeMapClickDetail = Parameters<NonNullable<ComponentMapProps['onClick']>>[0];
-type NativeMapPolylineClickDetail = Parameters<NonNullable<ComponentMapProps['onPolylineClick']>>[0];
-type NativeMapRegionChangeDetail = Parameters<NonNullable<ComponentMapProps['onRegionChange']>>[0];
 type ResolvedMapValues = {
     resolvedSetting: Record<string, unknown>;
     resolvedScale: number;
@@ -52,36 +47,6 @@ type CollectUnsupportedOptions = {
     circles: MapProps['circles'];
     resolvedPolygons: MapProps.polygon[];
 };
-type CreateMapElementPropsOptions = {
-    mapId: string;
-    className: MapProps['className'];
-    mapRef: {
-        current: MapRef | null;
-    };
-    style: MapProps['style'];
-    hidden: boolean | undefined;
-    latitude: number;
-    longitude: number;
-    resolvedMapStyle: ReturnType<typeof resolveCustomMapStyle>;
-    resolvedScale: number;
-    resolvedMinScale: number;
-    resolvedMaxScale: number;
-    resolvedRotate: number;
-    resolvedShowScale: boolean;
-    resolvedEnableTilt: boolean;
-    resolvedEnableScale: boolean;
-    resolvedEnableDrag: boolean;
-    resolvedEnableRotate: boolean;
-    polyline: MapProps['polyline'];
-    circles: MapProps['circles'];
-    resolvedPolygons: MapProps.polygon[];
-    onTap: MapProps['onTap'];
-    onBaseClick: MapProps['onClick'];
-    onUpdated: MapProps['onUpdated'];
-    onInitComplete: MapProps['onInitComplete'];
-    onRegionChange: MapProps['onRegionChange'];
-    onPolylineTap: MapProps['onPolylineTap'];
-};
 declare const MAP_UNSUPPORTED_PROPS: readonly ["animation", "controls", "showLocation", "subkey", "layerStyle", "skew", "showCompass", "enableSatellite", "enableTraffic", "groundOverlays", "tileOverlay", "enablePoi", "enableBuilding", "panels", "theme", "optimize", "enableAutoMaxOverlooking", "enable3D", "onTouchStart", "onTouchMove", "onTouchCancel", "onTouchEnd", "onLongPress", "onLongClick", "onTransitionEnd", "onAnimationStart", "onAnimationIteration", "onAnimationEnd", "onControlTap", "onPoiTap", "onAbilitySuccess", "onAbilityFailed", "onAuthSuccess", "onInterpolatePoint", "onError", "onAnchorPointTap", "onPanelTap"];
 export type RuntimeMarker = MapProps.marker & {
     children?: unknown;
@@ -104,69 +69,23 @@ export declare function resolveMapValues(values: {
     customMapStyle: MapProps['customMapStyle'];
 }): ResolvedMapValues;
 export declare function collectMapUnsupportedWarnings(options: CollectUnsupportedOptions): string[];
-export declare function createMapElementProps(options: CreateMapElementPropsOptions): {
+export declare function resolveNativeCircles(circles: MapProps['circles']): (Omit<{
     id: string;
-    className: string;
-    ref: {
-        current: MapRef | null;
+    center: {
+        latitude: number;
+        longitude: number | undefined;
     };
-    style: CSSProperties;
-    mapStyle: "normal-light" | "simple-light" | undefined;
+    radius: number;
+    strokeWidth: number | undefined;
+    strokeColor: string | undefined;
+    fillColor: string | undefined;
+}, "center"> & {
     center: {
         latitude: number;
         longitude: number;
     };
-    scale: number;
-    minScale: number;
-    maxScale: number;
-    rotate: number;
-    showScale: boolean;
-    enableTilt: boolean;
-    enableScale: boolean;
-    enableDrag: boolean;
-    enableRotate: boolean;
-    polyline: {
-        id: string;
-        points: MapProps.point[];
-        edgeColor: string[] | undefined;
-        edgeTexture: string[] | undefined;
-        edgeTextureAssets: {
-            id: string;
-            url: string;
-        }[] | undefined;
-        width: number | undefined;
-        dottedLine: boolean | undefined;
-    }[];
-    circles: (Omit<{
-        id: string;
-        center: {
-            latitude: number;
-            longitude: number | undefined;
-        };
-        radius: number;
-        strokeWidth: number | undefined;
-        strokeColor: string | undefined;
-        fillColor: string | undefined;
-    }, "center"> & {
-        center: {
-            latitude: number;
-            longitude: number;
-        };
-    })[];
-    polygons: {
-        id: string;
-        points: MapProps.point[];
-        dottedLine: boolean | undefined;
-        strokeWidth: number | undefined;
-        strokeColor: string | undefined;
-        fillColor: string | undefined;
-        zIndex: number | undefined;
-    }[];
-    onClick: (detail: NativeMapClickDetail) => void;
-    onMapLoaded: () => void;
-    onRegionChange: (detail: NativeMapRegionChangeDetail) => void;
-    onPolylineClick: (detail: NativeMapPolylineClickDetail) => void;
-};
+})[];
+export declare function mergeMapStyle(style: MapProps['style'], hidden?: boolean): CSSProperties;
 export declare function toCommonEvent<T>(detail: T, type: string, mapId: string): CommonEvent<T>;
 export {};
 //# sourceMappingURL=mapping.d.ts.map

package/dist/components/Map/mapping.js

@@ -1,4 +1,4 @@
-import { getBooleanSetting, getNumberSetting, mapPolylineTapDetail, mapRegionChangeDetail, normalizeSetting, resolveCircles, resolveCustomMapStyle, resolveNativePolygons, resolvePadding, resolvePolylines } from './bridge.js';
+import { getBooleanSetting, getNumberSetting, normalizeSetting, resolveCircles, resolveCustomMapStyle, resolvePadding } from './bridge.js';
 const SUPPORTED_SETTING_KEYS = new Set([
     'scale',
     'minScale',
@@ -84,47 +84,6 @@ export function collectMapUnsupportedWarnings(options) {
     unsupported.push(...collectShapeWarnings(options.resolvedMarkers, options.polyline, options.circles, options.resolvedPolygons));
     return dedupe(unsupported);
 }
-export function createMapElementProps(options) {
-    return {
-        id: options.mapId,
-        className: options.className || '',
-        ref: options.mapRef,
-        style: mergeMapStyle(options.style, options.hidden),
-        mapStyle: options.resolvedMapStyle,
-        center: {
-            latitude: options.latitude,
-            longitude: options.longitude
-        },
-        scale: options.resolvedScale,
-        minScale: options.resolvedMinScale,
-        maxScale: options.resolvedMaxScale,
-        rotate: options.resolvedRotate,
-        showScale: options.resolvedShowScale,
-        enableTilt: options.resolvedEnableTilt,
-        enableScale: options.resolvedEnableScale,
-        enableDrag: options.resolvedEnableDrag,
-        enableRotate: options.resolvedEnableRotate,
-        polyline: resolvePolylines(options.polyline),
-        circles: resolveNativeCircles(options.circles),
-        polygons: resolveNativePolygons(options.resolvedPolygons),
-        onClick: (detail) => {
-            const event = toCommonEvent({ point: detail.point }, 'tap', options.mapId);
-            options.onTap?.(event);
-            options.onBaseClick?.(event);
-        },
-        onMapLoaded: () => {
-            const event = toCommonEvent(undefined, 'updated', options.mapId);
-            options.onUpdated?.(event);
-            options.onInitComplete?.(event);
-        },
-        onRegionChange: (detail) => {
-            options.onRegionChange?.(toCommonEvent(mapRegionChangeDetail(detail), 'regionchange', options.mapId));
-        },
-        onPolylineClick: (detail) => {
-            options.onPolylineTap?.(toCommonEvent(mapPolylineTapDetail(detail), 'polylinetap', options.mapId));
-        }
-    };
-}
 function collectUnsupportedProps(values) {
     const unsupported = [];
     MAP_UNSUPPORTED_PROPS.forEach((key) => {
@@ -159,10 +118,10 @@ function collectShapeWarnings(markers, polylines, circles, polygons) {
     }
     return unsupported;
 }
-function resolveNativeCircles(circles) {
+export function resolveNativeCircles(circles) {
     return resolveCircles(circles).filter((circle) => typeof circle.center.longitude === 'number');
 }
-function mergeMapStyle(style, hidden) {
+export function mergeMapStyle(style, hidden) {
     if (typeof style === 'string') {
         const hiddenStyle = hidden ? 'display:none;' : '';
         const zIndexStyle = style.includes('z-index') ? '' : 'z-index:0;';

package/package.json

@@ -37,7 +37,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "0.0.23",
+  "version": "0.0.24",
   "scripts": {
     "dev": "npm run build -- -w",
     "build": "rimraf dist bundle && tsc -p tsconfig.build.json",