@doubao-apps/taro-runtime 0.0.20 → 0.0.21

package/dist/api/map/index.js

@@ -27,8 +27,12 @@ export function createMapContext(mapId, _component) {
             if (!Array.isArray(resolvedOption.points)) {
                 return rejectMethod('includePoints', resolvedOption, 'points is required');
             }
+            const padding = normalizeFitPointsPadding(resolvedOption.padding);
+            if (resolvedOption.padding !== undefined && padding === undefined) {
+                return rejectMethod('includePoints', resolvedOption, 'padding does not support non-number values');
+            }
             return runWithController(mapId, 'includePoints', resolvedOption, (controller) => {
-                controller[MAP_CONTEXT_METHOD_TO_COMPONENT_METHOD.includePoints](resolvedOption.points, resolvedOption.padding);
+                controller[MAP_CONTEXT_METHOD_TO_COMPONENT_METHOD.includePoints](resolvedOption.points, padding);
                 return undefined;
             });
         },
@@ -105,4 +109,16 @@ function rejectMethod(method, option, message) {
     emitFailure(option, payload);
     return Promise.reject(payload);
 }
+function normalizeFitPointsPadding(padding) {
+    if (padding === undefined || (Array.isArray(padding) && padding.length === 0)) {
+        return undefined;
+    }
+    if (!Array.isArray(padding) || padding.some((value) => typeof value !== 'number')) {
+        return undefined;
+    }
+    const [top, right = top, bottom = top, left = right] = padding;
+    // Taro includePoints padding follows top/right/bottom/left, but component
+    // fitPoints expects left/right/top/bottom.
+    return [left, right, top, bottom];
+}
 //# sourceMappingURL=index.js.map

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

@@ -1,27 +1,5 @@
-import type { MapMarkerProps } from '@byted-doubao-apps/components';
+import type { MapMarkerProps, MapProps as ComponentMapProps } from '@byted-doubao-apps/components';
 import type { MapProps } from '@tarojs/components';
-export interface NativeRegionChangeDetail {
-    type: 'begin' | 'end';
-    rotate: number;
-    scale: number;
-    center: MapProps.point;
-    region: {
-        northeast: MapProps.point;
-        southwest: MapProps.point;
-    };
-    causedBy: 'drag' | 'scale' | 'rotate';
-}
-export interface NativeRegionChangeLike {
-    type: 'begin' | 'end';
-    rotate?: number;
-    scale?: number;
-    center?: MapProps.point;
-    region?: {
-        northeast: MapProps.point;
-        southwest: MapProps.point;
-    };
-    causedBy?: 'drag' | 'scale' | 'rotate';
-}
 export interface NativeMarkerBridgeProps {
     markerId: string | number;
     position: MapProps.point;
@@ -83,8 +61,8 @@ export declare function resolveNativePolygons(polygons: MapProps.polygon[]): {
 }[];
 export declare function resolvePadding(padding: NonNullable<MapProps['includePadding']>): number[] | undefined;
 export declare function resolveCustomMapStyle(customMapStyle: MapProps['customMapStyle']): "normal-light" | "simple-light" | undefined;
-export declare function mapRegionChangeDetail(detail: NativeRegionChangeDetail): MapProps.onRegionEventDetail<'begin'> | MapProps.onRegionEventDetail<'end'>;
-export declare function mapPolylineTapDetail(id: string): MapProps.onPolylineTapEventDetail;
+export declare function mapRegionChangeDetail(detail: Parameters<NonNullable<ComponentMapProps['onRegionChange']>>[0]): MapProps.onRegionEventDetail<'begin'> | MapProps.onRegionEventDetail<'end'>;
+export declare function mapPolylineTapDetail(detail: Parameters<NonNullable<ComponentMapProps['onPolylineClick']>>[0]): MapProps.onPolylineTapEventDetail;
 export declare function mapMarkerToNativeProps(marker: MapProps.marker, index: number): NativeMarkerBridgeProps;
 export declare function getMarkerId(marker: MapProps.marker, index: number): number;
 export declare function createMarkerElementProps(options: MarkerElementPropsOptions): MapMarkerProps;
@@ -97,8 +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' | 'rotate'): "scale" | "drag" | "update";
-export declare function toNativeRegionChangeDetail(detail: NativeRegionChangeLike): NativeRegionChangeDetail;
+export declare function mapRegionCausedByEnd(causedBy: 'drag' | 'scale', by?: '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

@@ -77,12 +77,29 @@ export function resolveNativePolygons(polygons) {
     }));
 }
 export function resolvePadding(padding) {
-    const values = [padding.top, padding.left, padding.bottom, padding.right];
-    if (values.some((value) => typeof value !== 'number')) {
+    // Taro includePadding is expressed as top/right/bottom/left,
+    // while Doubao MapRef.fitPoints expects left/right/top/bottom.
+    const values = [padding.left, padding.right, padding.top, padding.bottom]
+        .map((value) => toPaddingNumber(value))
+        .filter((value) => value !== undefined);
+    if (values.length !== 4) {
+        console.error('[doubao-apps/taro-runtime] Map includePadding does not support non-number values.');
         return undefined;
     }
     return values;
 }
+function toPaddingNumber(value) {
+    if (typeof value === 'number') {
+        return value;
+    }
+    if (typeof value === 'string') {
+        const parsed = Number(value.trim());
+        if (Number.isFinite(parsed)) {
+            return parsed;
+        }
+    }
+    return undefined;
+}
 export function resolveCustomMapStyle(customMapStyle) {
     if (customMapStyle === 'default') {
         return 'normal-light';
@@ -93,45 +110,56 @@ export function resolveCustomMapStyle(customMapStyle) {
     return undefined;
 }
 export function mapRegionChangeDetail(detail) {
+    const center = detail.center ?? { latitude: 0, longitude: 0 };
+    const regionSource = detail.region ?? {
+        northeast: center,
+        southwest: center
+    };
+    const causedBy = detail.causedBy ?? 'drag';
+    const rotate = detail.rotate ?? 0;
+    const scale = detail.scale ?? 0;
+    const beginCausedBy = mapRegionCausedByBegin(causedBy, detail.by);
     const region = {
-        northeast: detail.region.northeast,
+        northeast: regionSource.northeast,
         southeast: {
-            longitude: detail.region.northeast.longitude,
-            latitude: detail.region.southwest.latitude
+            longitude: regionSource.northeast.longitude,
+            latitude: regionSource.southwest.latitude
         }
     };
     if (detail.type === 'begin') {
         return {
             type: 'begin',
-            causedBy: 'gesture',
+            causedBy: beginCausedBy,
             detail: {
-                rotate: detail.rotate,
+                rotate,
                 skew: 0,
-                causedBy: 'gesture',
+                causedBy: beginCausedBy,
                 type: 'begin',
-                scale: detail.scale,
-                centerLocation: detail.center,
+                scale,
+                centerLocation: center,
                 region
             }
         };
     }
     return {
         type: 'end',
-        causedBy: mapRegionCausedByEnd(detail.causedBy),
+        causedBy: mapRegionCausedByEnd(causedBy, detail.by),
         detail: {
-            rotate: detail.rotate,
+            rotate,
             skew: 0,
-            causedBy: mapRegionCausedByEnd(detail.causedBy),
+            causedBy: mapRegionCausedByEnd(causedBy, detail.by),
             type: 'end',
-            scale: detail.scale,
-            centerLocation: detail.center,
+            scale,
+            centerLocation: center,
             region
         }
     };
 }
-export function mapPolylineTapDetail(id) {
+export function mapPolylineTapDetail(detail) {
     return {
-        polylineId: coerceEventId(id)
+        polylineId: coerceEventId(detail.id),
+        longitude: 0,
+        latitude: 0
     };
 }
 export function mapMarkerToNativeProps(marker, index) {
@@ -252,26 +280,17 @@ export function removeMarkersByIds(markers, markerIds) {
 export function getNumericMarkerId(marker) {
     return typeof marker.id === 'number' ? marker.id : undefined;
 }
-export function mapRegionCausedByEnd(causedBy) {
-    if (causedBy === 'drag' || causedBy === 'scale') {
-        return causedBy;
+export function mapRegionCausedByEnd(causedBy, by) {
+    if (by === 'api') {
+        return 'update';
     }
-    return 'update';
+    return causedBy;
 }
-export function toNativeRegionChangeDetail(detail) {
-    const center = detail.center ?? { latitude: 0, longitude: 0 };
-    const region = detail.region ?? {
-        northeast: center,
-        southwest: center
-    };
-    return {
-        type: detail.type,
-        rotate: detail.rotate ?? 0,
-        scale: detail.scale ?? 0,
-        center,
-        region,
-        causedBy: detail.causedBy ?? 'rotate'
-    };
+function mapRegionCausedByBegin(causedBy, by) {
+    if (by === 'api') {
+        return 'update';
+    }
+    return 'gesture';
 }
 export function dispatchMarkerTapEvent(handlers, event) {
     handlers.onMarkerTap?.(event);

package/dist/components/Map/index.jsx

@@ -89,13 +89,21 @@ function DoubaoAppsMap(props) {
         resolvedPolygons
     });
     warnUnsupported('Map', unsupported);
+    const { top: includePaddingTop, right: includePaddingRight, bottom: includePaddingBottom, left: includePaddingLeft } = includePadding ?? {};
     useEffect(() => {
         if (!mapControllerRef.current || !includePoints?.length) {
             return;
         }
         const padding = includePadding ? resolvePadding(includePadding) : undefined;
         void mapControllerRef.current.fitPoints(includePoints, padding);
-    }, [includePadding, includePoints, mapControllerRef]);
+    }, [
+        includePoints,
+        includePaddingTop,
+        includePaddingRight,
+        includePaddingBottom,
+        includePaddingLeft,
+        mapControllerRef
+    ]);
     useEffect(() => {
         if (!mapId || !mapControllerRef.current) {
             return;

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

@@ -1,7 +1,8 @@
 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, type NativeRegionChangeLike } from './bridge.js';
+import { resolveCustomMapStyle } from './bridge.js';
 type CommonEvent<T = unknown> = {
     type: string;
     timeStamp: number;
@@ -19,12 +20,9 @@ type CommonEvent<T = unknown> = {
     preventDefault: () => void;
     stopPropagation: () => void;
 };
-type NativeMapClickDetail = {
-    point: MapProps.point;
-};
-type NativeMapPolylineClickDetail = {
-    id: string;
-};
+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;
@@ -166,7 +164,7 @@ export declare function createMapElementProps(options: CreateMapElementPropsOpti
     }[];
     onClick: (detail: NativeMapClickDetail) => void;
     onMapLoaded: () => void;
-    onRegionChange: (detail: NativeRegionChangeLike) => void;
+    onRegionChange: (detail: NativeMapRegionChangeDetail) => void;
     onPolylineClick: (detail: NativeMapPolylineClickDetail) => void;
 };
 export declare function toCommonEvent<T>(detail: T, type: string, mapId: string): CommonEvent<T>;

package/dist/components/Map/mapping.js

@@ -1,4 +1,4 @@
-import { getBooleanSetting, getNumberSetting, mapPolylineTapDetail, mapRegionChangeDetail, normalizeSetting, resolveCircles, resolveCustomMapStyle, resolveNativePolygons, resolvePadding, resolvePolylines, toNativeRegionChangeDetail } from './bridge.js';
+import { getBooleanSetting, getNumberSetting, mapPolylineTapDetail, mapRegionChangeDetail, normalizeSetting, resolveCircles, resolveCustomMapStyle, resolveNativePolygons, resolvePadding, resolvePolylines } from './bridge.js';
 const SUPPORTED_SETTING_KEYS = new Set([
     'scale',
     'minScale',
@@ -118,10 +118,10 @@ export function createMapElementProps(options) {
             options.onInitComplete?.(event);
         },
         onRegionChange: (detail) => {
-            options.onRegionChange?.(toCommonEvent(mapRegionChangeDetail(toNativeRegionChangeDetail(detail)), 'regionchange', options.mapId));
+            options.onRegionChange?.(toCommonEvent(mapRegionChangeDetail(detail), 'regionchange', options.mapId));
         },
         onPolylineClick: (detail) => {
-            options.onPolylineTap?.(toCommonEvent(mapPolylineTapDetail(detail.id), 'polylinetap', options.mapId));
+            options.onPolylineTap?.(toCommonEvent(mapPolylineTapDetail(detail), 'polylinetap', options.mapId));
         }
     };
 }

package/package.json

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