Skip to content

Pass labelPosition through the React Native bridge #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wf9a5m75 merged 1 commit into from
Oct 23, 2026
Merged

Pass labelPosition through the React Native bridge #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions android/src/main/java/com/mapconductor/react/marker/NativeMarkerCodec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.facebook.react.bridge.ReadableMap
import com.mapconductor.core.features.GeoPoint
import com.mapconductor.core.marker.AbstractDefaultIcon
import com.mapconductor.core.marker.ColorDefaultIcon
import com.mapconductor.core.marker.DrawableDefaultIcon
import com.mapconductor.core.marker.ImageIcon
Expand Down Expand Up @@ -207,6 +208,7 @@ private data class NativeMarkerIcon(
val labelTextColor: Color?,
val labelTextSize: Float,
val labelStrokeColor: Color,
val labelPosition: String,
) {
fun toMarkerIcon(context: Context): MarkerIconInterface? {
iconCache[this]?.let { return it }
Expand All @@ -221,6 +223,7 @@ private data class NativeMarkerIcon(
labelTextColor = labelTextColor,
labelTextSize = labelTextSize.sp,
labelStrokeColor = labelStrokeColor,
labelPosition = labelPosition,
infoAnchor = infoAnchor,
iconSize = iconSize.dp,
debug = debug,
Expand All @@ -237,6 +240,7 @@ private data class NativeMarkerIcon(
labelTextColor = labelTextColor,
labelTextSize = labelTextSize.sp,
labelStrokeColor = labelStrokeColor,
labelPosition = labelPosition,
infoAnchor = infoAnchor,
iconSize = iconSize.dp,
debug = debug,
Expand Down Expand Up @@ -283,6 +287,7 @@ private data class NativeMarkerIcon(
parseColor(map.string("labelTextColor"), Color.Black),
labelTextSize = (map.number("labelTextSize") ?: 18.0).toFloat(),
labelStrokeColor = parseColor(map.string("labelStrokeColor"), Color.White),
labelPosition = map.string("labelPosition") ?: AbstractDefaultIcon.DEFAULT_LABEL_POSITION,
)
}
}
Expand Down
6 changes: 5 additions & 1 deletion ios/NativeMapCodec.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ public struct NativeMarkerIconPayload {
public let labelTextColor: UIColor?
public let labelTextSize: CGFloat
public let labelStrokeColor: UIColor
public let labelPosition: String

public static func decode(_ value: Any?) -> NativeMarkerIconPayload? {
guard let map = mcMap(value), let type = mcString(map["type"]),
Expand All @@ -207,7 +208,8 @@ public struct NativeMarkerIconPayload {
label: mcString(map["label"]),
labelTextColor: mcColor(css: map["labelTextColor"], default: .black),
labelTextSize: CGFloat(mcDouble(map["labelTextSize"], default: 18.0)),
labelStrokeColor: mcColor(css: map["labelStrokeColor"], default: .white) ?? .white
labelStrokeColor: mcColor(css: map["labelStrokeColor"], default: .white) ?? .white,
labelPosition: mcString(map["labelPosition"]) ?? DefaultMarkerIcon.defaultLabelPosition
)
}

Expand All @@ -222,6 +224,7 @@ public struct NativeMarkerIconPayload {
labelTextColor: labelTextColor,
labelTextSize: labelTextSize,
labelStrokeColor: labelStrokeColor,
labelPosition: labelPosition,
infoAnchor: infoAnchor,
iconSize: iconSize,
debug: debug
Expand All @@ -238,6 +241,7 @@ public struct NativeMarkerIconPayload {
labelTextColor: labelTextColor,
labelTextSize: labelTextSize,
labelStrokeColor: labelStrokeColor,
labelPosition: labelPosition,
infoAnchor: infoAnchor,
iconSize: iconSize,
debug: debug
Expand Down
6 changes: 4 additions & 2 deletions src/info/InfoBubbleLayer.native.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useEffect, useMemo, useState } from 'react';
import { StyleSheet, View } from 'react-native';
import type { Offset } from '@mapconductor/js-sdk-core';
import { markerIconExtentPx } from '@mapconductor/js-sdk-core';
import type { MapViewScope } from '../MapViewScope.native';
import type { InfoBubbleEntry } from './InfoBubbleEntry';
import { InfoBubbleOverlay } from './InfoBubbleOverlay.native';
Expand Down Expand Up @@ -57,15 +58,16 @@ export function InfoBubbleLayer({
const markerId = entry.markerId ?? entry.id;
const offset = infoBubbleScreenPositions.get(entry.id) ?? markerScreenPositions.get(markerId);
if (!offset) return null;
const iconSizeValue = entry.icon ? entry.icon.iconSize * entry.icon.scale : 0;
// anchor / infoAnchor はアイコンの実寸に対する割合（web と同じ。InfoBubbleOverlay を参照）。
const iconSizeValue = markerIconExtentPx(entry.icon);
const iconOffset = entry.icon?.anchor ?? { x: 0.5, y: 0.5 };
const infoAnchorOffset = entry.icon?.infoAnchor ?? { x: 0.5, y: 0.5 };

return (
<InfoBubbleOverlay
key={entry.id}
positionOffset={offset}
iconSize={{ width: iconSizeValue, height: iconSizeValue }}
iconSize={iconSizeValue}
iconOffset={iconOffset}
infoAnchorOffset={infoAnchorOffset}
tailOffset={entry.tailOffset}
Expand Down
15 changes: 13 additions & 2 deletions src/marker/ReactNativeImageIcon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { MarkerIcon, Offset, BitmapIcon } from '@mapconductor/js-sdk-core';
import type { MarkerIcon, MarkerLabelPosition, Offset, BitmapIcon } from '@mapconductor/js-sdk-core';
import { ColorDefaultIcon, combineHash, hashBool, hashNum, hashStr } from '@mapconductor/js-sdk-core';
import { Settings } from '@mapconductor/js-sdk-core';

Expand All @@ -18,6 +18,8 @@ export interface ReactNativeImageDefaultIconOptions {
labelTextColor?: string | null;
labelTextSize?: number;
labelStrokeColor?: string;
/** ラベルをピンに対してどこへ置くか。書き方は `DefaultMarkerIconOptions.labelPosition` と同じ。 */
labelPosition?: MarkerLabelPosition;
infoAnchor?: Offset;
iconSize?: number;
debug?: boolean;
Expand Down Expand Up @@ -66,7 +68,10 @@ export class ReactNativeImageDefaultIcon implements MarkerIcon {
readonly labelTextColor: string | null;
readonly labelTextSize: number;
readonly labelStrokeColor: string;
readonly labelPosition: MarkerLabelPosition;
readonly iconSize: number;
// 描くのはネイティブ側。JS からはピン本体に対する割合のまま扱う（吹き出しの位置計算は
// infoAnchor − anchor の差しか使わないので、ラベルの置き場所に依らず正しい）。
readonly anchor: Offset = { x: 0.5, y: 1 };
readonly infoAnchor: Offset;
readonly debug: boolean;
Expand All @@ -82,6 +87,7 @@ export class ReactNativeImageDefaultIcon implements MarkerIcon {
this.labelTextColor = options.labelTextColor ?? '#000000';
this.labelTextSize = options.labelTextSize ?? 18;
this.labelStrokeColor = options.labelStrokeColor ?? '#ffffff';
this.labelPosition = options.labelPosition ?? 'center center';
this.infoAnchor = options.infoAnchor ?? { x: 0.5, y: 0 };
this.iconSize = options.iconSize ?? Settings.Default.iconSize;
this.debug = options.debug ?? false;
Expand All @@ -96,6 +102,7 @@ export class ReactNativeImageDefaultIcon implements MarkerIcon {
result = combineHash(result, hashStr(this.labelTextColor ?? ''));
result = combineHash(result, hashNum(this.labelTextSize));
result = combineHash(result, hashStr(this.labelStrokeColor));
result = combineHash(result, hashStr(this.labelPosition));
result = combineHash(result, hashNum(this.infoAnchor.x));
result = combineHash(result, hashNum(this.infoAnchor.y));
result = combineHash(result, hashNum(this.iconSize));
Expand Down Expand Up @@ -133,6 +140,7 @@ export interface NativeMarkerIconPayload {
labelTextColor?: string | null;
labelTextSize?: number;
labelStrokeColor?: string;
labelPosition?: string;
}

export function markerIconToNative(icon: MarkerIcon | null): NativeMarkerIconPayload | null {
Expand All @@ -147,7 +155,9 @@ export function markerIconToNative(icon: MarkerIcon | null): NativeMarkerIconPay
labelTextColor: icon.labelTextColor,
labelTextSize: icon.labelTextSize,
labelStrokeColor: icon.labelStrokeColor,
infoAnchor: icon.infoAnchor,
labelPosition: icon.labelPosition,
// ネイティブ側でレイアウトし直すので、ビットマップ基準へ直す前の値を渡す。
infoAnchor: icon.requestedInfoAnchor,
iconSize: icon.iconSize,
debug: icon.debug,
};
Expand All @@ -174,6 +184,7 @@ export function markerIconToNative(icon: MarkerIcon | null): NativeMarkerIconPay
labelTextColor: icon.labelTextColor,
labelTextSize: icon.labelTextSize,
labelStrokeColor: icon.labelStrokeColor,
labelPosition: icon.labelPosition,
infoAnchor: icon.infoAnchor,
iconSize: icon.iconSize,
debug: icon.debug,
Expand Down