react-native-maplibre-gl-js 1.23.1 → 1.23.3
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.
- package/lib/module/communication/messages.utils.js +61 -0
- package/lib/module/communication/messages.utils.js.map +1 -1
- package/lib/module/react-native/components-factories/hooks/useMountUnmountUpdateCallbacks.js +33 -30
- package/lib/module/react-native/components-factories/hooks/useMountUnmountUpdateCallbacks.js.map +1 -1
- package/lib/module/react-native/components-factories/hooks/useMountUnmountUpdateCallbacks.utils.js +8 -61
- package/lib/module/react-native/components-factories/hooks/useMountUnmountUpdateCallbacks.utils.js.map +1 -1
- package/lib/module/react-native/components-factories/hooks/useWebObjectMethodsProxy.js +1 -1
- package/lib/module/react-native/components-factories/hooks/useWebObjectMethodsProxy.js.map +1 -1
- package/lib/module/web/controllers/WebObjectsController.js +8 -2
- package/lib/module/web/controllers/WebObjectsController.js.map +1 -1
- package/lib/module/web/generated/webview_static_html.js +5 -2
- package/lib/module/web/generated/webview_static_html.js.map +1 -1
- package/lib/typescript/src/communication/messages.utils.d.ts +4 -1
- package/lib/typescript/src/communication/messages.utils.d.ts.map +1 -1
- package/lib/typescript/src/react-native/components-factories/hooks/useMountUnmountUpdateCallbacks.d.ts.map +1 -1
- package/lib/typescript/src/react-native/components-factories/hooks/useMountUnmountUpdateCallbacks.utils.d.ts +1 -4
- package/lib/typescript/src/react-native/components-factories/hooks/useMountUnmountUpdateCallbacks.utils.d.ts.map +1 -1
- package/lib/typescript/src/web/controllers/WebObjectsController.d.ts.map +1 -1
- package/lib/typescript/src/web/generated/webview_static_html.d.ts +1 -1
- package/lib/typescript/src/web/generated/webview_static_html.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -25,4 +25,65 @@ export const isWebObjectListenerOnHTMLElement = listener => {
|
|
|
25
25
|
return 'elementListener' in listener;
|
|
26
26
|
};
|
|
27
27
|
export const getHTMLElementDescriptorListenerName = listener => `${listener.eventName}${listener.cssSelector}`;
|
|
28
|
+
export const removeHTMLElementListeners = (options, optionsThatAreHTMLElements) => {
|
|
29
|
+
if (!options || typeof options !== 'object') {
|
|
30
|
+
return options;
|
|
31
|
+
}
|
|
32
|
+
if (Array.isArray(options)) {
|
|
33
|
+
return options.map(opt => removeHTMLElementListeners(opt, optionsThatAreHTMLElements));
|
|
34
|
+
}
|
|
35
|
+
const result = {};
|
|
36
|
+
for (const key in options) {
|
|
37
|
+
if (optionsThatAreHTMLElements.includes(key) && Array.isArray(options[key]?.listeners)) {
|
|
38
|
+
result[key] = {
|
|
39
|
+
...options[key],
|
|
40
|
+
listeners: options[key].listeners.map(({
|
|
41
|
+
cssSelector,
|
|
42
|
+
eventName
|
|
43
|
+
}) => ({
|
|
44
|
+
cssSelector,
|
|
45
|
+
eventName
|
|
46
|
+
}))
|
|
47
|
+
};
|
|
48
|
+
} else {
|
|
49
|
+
result[key] = removeHTMLElementListeners(options[key], optionsThatAreHTMLElements);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return result;
|
|
53
|
+
};
|
|
54
|
+
export const extractHTMLElementListenersFromOptions = (options, optionsThatAreHTMLElements) => {
|
|
55
|
+
let callbacks = {};
|
|
56
|
+
for (const key of optionsThatAreHTMLElements) {
|
|
57
|
+
callbacks = {
|
|
58
|
+
...callbacks,
|
|
59
|
+
...extractHTMLElementListenersFromDescriptor(options?.[key])
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
return callbacks;
|
|
63
|
+
};
|
|
64
|
+
export const extractHTMLElementListenersFromMethodArgs = methodArgs => {
|
|
65
|
+
let callbacks = {};
|
|
66
|
+
for (const arg of methodArgs) {
|
|
67
|
+
// TODO we need a more robust way to identify HTMLElements. A class for
|
|
68
|
+
// HTMLElementDescriptor could be created.
|
|
69
|
+
if (!arg?.listeners) {
|
|
70
|
+
continue;
|
|
71
|
+
}
|
|
72
|
+
callbacks = {
|
|
73
|
+
...callbacks,
|
|
74
|
+
...extractHTMLElementListenersFromDescriptor(arg)
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
return callbacks;
|
|
78
|
+
};
|
|
79
|
+
const extractHTMLElementListenersFromDescriptor = htmlElement => {
|
|
80
|
+
const callbacks = {};
|
|
81
|
+
const htmlListeners = htmlElement?.listeners;
|
|
82
|
+
htmlListeners?.forEach(listener => {
|
|
83
|
+
callbacks[getHTMLElementDescriptorListenerName(listener)] = {
|
|
84
|
+
elementListener: listener.callback
|
|
85
|
+
};
|
|
86
|
+
});
|
|
87
|
+
return callbacks;
|
|
88
|
+
};
|
|
28
89
|
//# sourceMappingURL=messages.utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["isWebObjectListenerOnRN","listener","isWebObjectListenerOnObject","isWebObjectListenerOnMapLayer","isWebObjectListenerOnHTMLElement","getHTMLElementDescriptorListenerName","eventName","cssSelector"],"sourceRoot":"../../../src","sources":["communication/messages.utils.ts"],"mappings":";;
|
|
1
|
+
{"version":3,"names":["isWebObjectListenerOnRN","listener","isWebObjectListenerOnObject","isWebObjectListenerOnMapLayer","isWebObjectListenerOnHTMLElement","getHTMLElementDescriptorListenerName","eventName","cssSelector","removeHTMLElementListeners","options","optionsThatAreHTMLElements","Array","isArray","map","opt","result","key","includes","listeners","extractHTMLElementListenersFromOptions","callbacks","extractHTMLElementListenersFromDescriptor","extractHTMLElementListenersFromMethodArgs","methodArgs","arg","htmlElement","htmlListeners","forEach","elementListener","callback"],"sourceRoot":"../../../src","sources":["communication/messages.utils.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/react-native/components-factories/hooks/useMountUnmountUpdateCallbacks.js
CHANGED
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
import { useCallback } from 'react';
|
|
4
4
|
import useMapAtoms from "../../hooks/atoms/useMapAtoms.js";
|
|
5
|
-
import {
|
|
5
|
+
import { useStableValue } from "./useMountUnmountUpdateCallbacks.utils.js";
|
|
6
|
+
import { extractHTMLElementListenersFromOptions, removeHTMLElementListeners } from "../../../communication/messages.utils.js";
|
|
6
7
|
|
|
7
8
|
/**
|
|
8
9
|
* @param input - The RN object props, etc.
|
|
@@ -19,24 +20,26 @@ const useMountUnmountUpdateCallbacks = input => {
|
|
|
19
20
|
setMapSourceListeners,
|
|
20
21
|
deleteMapSourceListeners
|
|
21
22
|
} = useMapAtoms();
|
|
23
|
+
// Behaviors.
|
|
24
|
+
const stableInput = useStableValue(input);
|
|
22
25
|
const mount = useCallback(() => {
|
|
23
|
-
switch (
|
|
26
|
+
switch (stableInput.type) {
|
|
24
27
|
case 'webObject':
|
|
25
28
|
{
|
|
26
29
|
dispatchMessage({
|
|
27
30
|
type: `webObjectMount`,
|
|
28
31
|
payload: {
|
|
29
|
-
options: removeHTMLElementListeners(
|
|
30
|
-
listeners:
|
|
31
|
-
objectId:
|
|
32
|
-
objectType:
|
|
32
|
+
options: removeHTMLElementListeners(stableInput.props.options, stableInput.optionsThatAreHTMLElements),
|
|
33
|
+
listeners: stableInput.props.listeners,
|
|
34
|
+
objectId: stableInput.objectId,
|
|
35
|
+
objectType: stableInput.objectType
|
|
33
36
|
}
|
|
34
37
|
});
|
|
35
38
|
setWebObjectListeners({
|
|
36
|
-
objectId:
|
|
39
|
+
objectId: stableInput.objectId,
|
|
37
40
|
listeners: {
|
|
38
|
-
...(
|
|
39
|
-
...extractHTMLElementListenersFromOptions(
|
|
41
|
+
...(stableInput.props.listeners ?? {}),
|
|
42
|
+
...extractHTMLElementListenersFromOptions(stableInput.props.options, stableInput.optionsThatAreHTMLElements)
|
|
40
43
|
}
|
|
41
44
|
});
|
|
42
45
|
break;
|
|
@@ -45,11 +48,11 @@ const useMountUnmountUpdateCallbacks = input => {
|
|
|
45
48
|
{
|
|
46
49
|
dispatchMessage({
|
|
47
50
|
type: `mapSourceMount`,
|
|
48
|
-
payload:
|
|
51
|
+
payload: stableInput.props
|
|
49
52
|
});
|
|
50
53
|
setMapSourceListeners({
|
|
51
|
-
sourceId:
|
|
52
|
-
listeners:
|
|
54
|
+
sourceId: stableInput.props.id,
|
|
55
|
+
listeners: stableInput.props.layers.map(item => item.listeners ? {
|
|
53
56
|
layerId: item.layer.id,
|
|
54
57
|
listeners: item.listeners
|
|
55
58
|
} : undefined).filter(item => item !== undefined) ?? []
|
|
@@ -57,23 +60,23 @@ const useMountUnmountUpdateCallbacks = input => {
|
|
|
57
60
|
break;
|
|
58
61
|
}
|
|
59
62
|
}
|
|
60
|
-
}, [
|
|
63
|
+
}, [stableInput, dispatchMessage, setWebObjectListeners, setMapSourceListeners]);
|
|
61
64
|
const update = useCallback(() => {
|
|
62
|
-
switch (
|
|
65
|
+
switch (stableInput.type) {
|
|
63
66
|
case 'webObject':
|
|
64
67
|
{
|
|
65
68
|
dispatchMessage({
|
|
66
69
|
type: `webObjectUpdate`,
|
|
67
70
|
payload: {
|
|
68
|
-
options:
|
|
69
|
-
listeners:
|
|
70
|
-
objectId:
|
|
71
|
-
objectType:
|
|
71
|
+
options: stableInput.props.options,
|
|
72
|
+
listeners: stableInput.props.listeners,
|
|
73
|
+
objectId: stableInput.objectId,
|
|
74
|
+
objectType: stableInput.objectType
|
|
72
75
|
}
|
|
73
76
|
});
|
|
74
77
|
setWebObjectListeners({
|
|
75
|
-
objectId:
|
|
76
|
-
listeners:
|
|
78
|
+
objectId: stableInput.objectId,
|
|
79
|
+
listeners: stableInput.props.listeners ?? {}
|
|
77
80
|
});
|
|
78
81
|
break;
|
|
79
82
|
}
|
|
@@ -81,11 +84,11 @@ const useMountUnmountUpdateCallbacks = input => {
|
|
|
81
84
|
{
|
|
82
85
|
dispatchMessage({
|
|
83
86
|
type: `mapSourceUpdate`,
|
|
84
|
-
payload:
|
|
87
|
+
payload: stableInput.props
|
|
85
88
|
});
|
|
86
89
|
setMapSourceListeners({
|
|
87
|
-
sourceId:
|
|
88
|
-
listeners:
|
|
90
|
+
sourceId: stableInput.props.id,
|
|
91
|
+
listeners: stableInput.props.layers.map(item => item.listeners ? {
|
|
89
92
|
layerId: item.layer.id,
|
|
90
93
|
listeners: item.listeners
|
|
91
94
|
} : undefined).filter(item => item !== undefined) ?? []
|
|
@@ -93,19 +96,19 @@ const useMountUnmountUpdateCallbacks = input => {
|
|
|
93
96
|
break;
|
|
94
97
|
}
|
|
95
98
|
}
|
|
96
|
-
}, [
|
|
99
|
+
}, [stableInput, dispatchMessage, setWebObjectListeners, setMapSourceListeners]);
|
|
97
100
|
const unmount = useCallback(() => {
|
|
98
|
-
switch (
|
|
101
|
+
switch (stableInput.type) {
|
|
99
102
|
case 'webObject':
|
|
100
103
|
{
|
|
101
104
|
dispatchMessage({
|
|
102
105
|
type: `webObjectUnmount`,
|
|
103
106
|
payload: {
|
|
104
|
-
objectId:
|
|
107
|
+
objectId: stableInput.objectId
|
|
105
108
|
}
|
|
106
109
|
});
|
|
107
110
|
deleteWebObjectListeners({
|
|
108
|
-
objectId:
|
|
111
|
+
objectId: stableInput.objectId
|
|
109
112
|
});
|
|
110
113
|
break;
|
|
111
114
|
}
|
|
@@ -114,16 +117,16 @@ const useMountUnmountUpdateCallbacks = input => {
|
|
|
114
117
|
dispatchMessage({
|
|
115
118
|
type: `mapSourceUnmount`,
|
|
116
119
|
payload: {
|
|
117
|
-
sourceId:
|
|
120
|
+
sourceId: stableInput.props.id
|
|
118
121
|
}
|
|
119
122
|
});
|
|
120
123
|
deleteMapSourceListeners({
|
|
121
|
-
sourceId:
|
|
124
|
+
sourceId: stableInput.props.id
|
|
122
125
|
});
|
|
123
126
|
break;
|
|
124
127
|
}
|
|
125
128
|
}
|
|
126
|
-
}, [
|
|
129
|
+
}, [stableInput, dispatchMessage, deleteWebObjectListeners, deleteMapSourceListeners]);
|
|
127
130
|
return {
|
|
128
131
|
mount,
|
|
129
132
|
update,
|
package/lib/module/react-native/components-factories/hooks/useMountUnmountUpdateCallbacks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useMapAtoms","extractHTMLElementListenersFromOptions","removeHTMLElementListeners","useMountUnmountUpdateCallbacks","input","dispatchMessage","setWebObjectListeners","deleteWebObjectListeners","setMapSourceListeners","deleteMapSourceListeners","mount","type","payload","options","props","optionsThatAreHTMLElements","listeners","objectId","objectType","sourceId","id","layers","map","item","layerId","layer","undefined","filter","update","unmount"],"sourceRoot":"../../../../../src","sources":["react-native/components-factories/hooks/useMountUnmountUpdateCallbacks.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,OAAO;AAEnC,OAAOC,WAAW,MAAM,kCAA+B;AACvD,SACEC,sCAAsC,EACtCC,0BAA0B,QACrB,
|
|
1
|
+
{"version":3,"names":["useCallback","useMapAtoms","useStableValue","extractHTMLElementListenersFromOptions","removeHTMLElementListeners","useMountUnmountUpdateCallbacks","input","dispatchMessage","setWebObjectListeners","deleteWebObjectListeners","setMapSourceListeners","deleteMapSourceListeners","stableInput","mount","type","payload","options","props","optionsThatAreHTMLElements","listeners","objectId","objectType","sourceId","id","layers","map","item","layerId","layer","undefined","filter","update","unmount"],"sourceRoot":"../../../../../src","sources":["react-native/components-factories/hooks/useMountUnmountUpdateCallbacks.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/react-native/components-factories/hooks/useMountUnmountUpdateCallbacks.utils.js
CHANGED
|
@@ -1,65 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const result = {};
|
|
12
|
-
for (const key in options) {
|
|
13
|
-
if (optionsThatAreHTMLElements.includes(key) && Array.isArray(options[key]?.listeners)) {
|
|
14
|
-
result[key] = {
|
|
15
|
-
...options[key],
|
|
16
|
-
listeners: options[key].listeners.map(({
|
|
17
|
-
cssSelector,
|
|
18
|
-
eventName
|
|
19
|
-
}) => ({
|
|
20
|
-
cssSelector,
|
|
21
|
-
eventName
|
|
22
|
-
}))
|
|
23
|
-
};
|
|
24
|
-
} else {
|
|
25
|
-
result[key] = removeHTMLElementListeners(options[key], optionsThatAreHTMLElements);
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
return result;
|
|
29
|
-
};
|
|
30
|
-
export const extractHTMLElementListenersFromOptions = (options, optionsThatAreHTMLElements) => {
|
|
31
|
-
let callbacks = {};
|
|
32
|
-
for (const key of optionsThatAreHTMLElements) {
|
|
33
|
-
callbacks = {
|
|
34
|
-
...callbacks,
|
|
35
|
-
...extractHTMLElementListenersFromDescriptor(options?.[key])
|
|
36
|
-
};
|
|
37
|
-
}
|
|
38
|
-
return callbacks;
|
|
39
|
-
};
|
|
40
|
-
export const extractHTMLElementListenersFromMethodArgs = methodArgs => {
|
|
41
|
-
let callbacks = {};
|
|
42
|
-
for (const arg of methodArgs) {
|
|
43
|
-
// TODO we need a more robust way to identify HTMLElements. A class for
|
|
44
|
-
// HTMLElementDescriptor could be created.
|
|
45
|
-
if (!arg?.listeners) {
|
|
46
|
-
continue;
|
|
47
|
-
}
|
|
48
|
-
callbacks = {
|
|
49
|
-
...callbacks,
|
|
50
|
-
...extractHTMLElementListenersFromDescriptor(arg)
|
|
51
|
-
};
|
|
52
|
-
}
|
|
53
|
-
return callbacks;
|
|
54
|
-
};
|
|
55
|
-
const extractHTMLElementListenersFromDescriptor = htmlElement => {
|
|
56
|
-
const callbacks = {};
|
|
57
|
-
const htmlListeners = htmlElement?.listeners;
|
|
58
|
-
htmlListeners?.forEach(listener => {
|
|
59
|
-
callbacks[getHTMLElementDescriptorListenerName(listener)] = {
|
|
60
|
-
elementListener: listener.callback
|
|
61
|
-
};
|
|
62
|
-
});
|
|
63
|
-
return callbacks;
|
|
3
|
+
import { useRef } from 'react';
|
|
4
|
+
import equal from 'fast-deep-equal';
|
|
5
|
+
export const useStableValue = value => {
|
|
6
|
+
const ref = useRef(value);
|
|
7
|
+
if (!equal(ref.current, value)) {
|
|
8
|
+
ref.current = value;
|
|
9
|
+
}
|
|
10
|
+
return ref.current;
|
|
64
11
|
};
|
|
65
12
|
//# sourceMappingURL=useMountUnmountUpdateCallbacks.utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["useRef","equal","useStableValue","value","ref","current"],"sourceRoot":"../../../../../src","sources":["react-native/components-factories/hooks/useMountUnmountUpdateCallbacks.utils.ts"],"mappings":";;AAAA,SAASA,MAAM,QAAQ,OAAO;AAC9B,OAAOC,KAAK,MAAM,iBAAiB;AAEnC,OAAO,MAAMC,cAAc,GAAOC,KAAQ,IAAQ;EAChD,MAAMC,GAAG,GAAGJ,MAAM,CAAIG,KAAK,CAAC;EAC5B,IAAI,CAACF,KAAK,CAACG,GAAG,CAACC,OAAO,EAAEF,KAAK,CAAC,EAAE;IAC9BC,GAAG,CAACC,OAAO,GAAGF,KAAK;EACrB;EACA,OAAOC,GAAG,CAACC,OAAO;AACpB,CAAC","ignoreList":[]}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
import { useCallback, useImperativeHandle, useMemo, useRef } from 'react';
|
|
4
4
|
import useMapAtoms from "../../hooks/atoms/useMapAtoms.js";
|
|
5
|
-
import { extractHTMLElementListenersFromMethodArgs } from "./useMountUnmountUpdateCallbacks.utils.js";
|
|
6
5
|
import { genRequestId } from "./useWebObjectMethodsProxy.utils.js";
|
|
6
|
+
import { extractHTMLElementListenersFromMethodArgs } from "../../../communication/messages.utils.js";
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
* Create a proxy to call the methods of the corresponding web world object,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useImperativeHandle","useMemo","useRef","useMapAtoms","
|
|
1
|
+
{"version":3,"names":["useCallback","useImperativeHandle","useMemo","useRef","useMapAtoms","genRequestId","extractHTMLElementListenersFromMethodArgs","useWebObjectMethodsProxy","ref","objectId","methodsThatContainHTMLElements","methodsThatContainHTMLElementsRef","dispatchMessage","setWebObjectPendingMethodResponse","updateWebObjectListeners","createProxy","Proxy","get","_","propKey","args","Promise","resolve","requestId","current","includes","newListeners","type","payload","method","methodsProxy"],"sourceRoot":"../../../../../src","sources":["react-native/components-factories/hooks/useWebObjectMethodsProxy.ts"],"mappings":";;AAAA,SAEEA,WAAW,EACXC,mBAAmB,EACnBC,OAAO,EACPC,MAAM,QACD,OAAO;AAKd,OAAOC,WAAW,MAAM,kCAA+B;AACvD,SAASC,YAAY,QAAQ,qCAAkC;AAC/D,SAASC,yCAAyC,QAAQ,0CAAuC;;AAEjG;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,wBAAwB,GAAGA,CACtCC,GAAsB,EACtBC,QAAqB,EACrBC,8BAAiD,KAC9C;EACH;EACA,MAAMC,iCAAiC,GAAGR,MAAM,CAC9CO,8BACF,CAAC;EACD;EACA;EACA,MAAM;IACJE,eAAe;IACfC,iCAAiC;IACjCC;EACF,CAAC,GAAGV,WAAW,CAAC,CAAC;EAEjB,MAAMW,WAAW,GAAGf,WAAW,CAAC,MAAW;IACzC,OAAO,IAAIgB,KAAK,CACd,CAAC,CAAC,EACF;MACEC,GAAGA,CAACC,CAAC,EAAEC,OAAO,EAAE;QACd,IAAIA,OAAO,KAAK,OAAO,EAAE;UACvB,OAAO,MAAMV,QAAQ;QACvB;QACA,OAAO,CAAC,GAAGW,IAAW,KAAK;UACzB,OAAO,IAAIC,OAAO,CAAEC,OAAO,IAAK;YAC9B,MAAMC,SAAS,GAAGlB,YAAY,CAAC,CAAC;YAChC;YACA,IACEM,iCAAiC,CAACa,OAAO,CAACC,QAAQ,CAChDN,OACF,CAAC,EACD;cACAL,wBAAwB,CAAC;gBACvBL,QAAQ;gBACRiB,YAAY,EAAEpB,yCAAyC,CAACc,IAAI;cAC9D,CAAC,CAAC;YACJ;YACA;YACAP,iCAAiC,CAAC;cAAEU,SAAS;cAAED;YAAQ,CAAC,CAAC;YACzD;YACAV,eAAe,CAAC;cACde,IAAI,EAAE,qBAAqB;cAC3BC,OAAO,EAAE;gBACPL,SAAS;gBACTd,QAAQ;gBACRoB,MAAM,EAAEV,OAAiB;gBACzBC;cACF;YACF,CAAC,CAAC;UACJ,CAAC,CAAC;QACJ,CAAC;MACH;IACF,CACF,CAAC;EACH,CAAC,EAAE,CACDX,QAAQ,EACRI,iCAAiC,EACjCD,eAAe,EACfE,wBAAwB,CACzB,CAAC;EAEF,MAAMgB,YAAY,GAAG5B,OAAO,CAAC,MAAMa,WAAW,CAAC,CAAC,EAAE,CAACA,WAAW,CAAC,CAAC;EAChE;EACAd,mBAAmB,CAACO,GAAG,EAAE,MAAMsB,YAAY,CAAC;AAC9C,CAAC;AAED,eAAevB,wBAAwB","ignoreList":[]}
|
|
@@ -98,8 +98,14 @@ export default class WebObjectsController {
|
|
|
98
98
|
case 'popup':
|
|
99
99
|
{
|
|
100
100
|
options = this.#resolveDescriptorsInOptions(objectId, reactNativeBridge, options, POPUP_OPTIONS_THAT_ARE_WEB_FUNCTIONS, POPUP_OPTIONS_THAT_ARE_HTML_ELEMENTS);
|
|
101
|
-
const
|
|
102
|
-
|
|
101
|
+
const {
|
|
102
|
+
element: htmlElement,
|
|
103
|
+
...popupOptions
|
|
104
|
+
} = options;
|
|
105
|
+
element = new maplibregl.Popup(popupOptions);
|
|
106
|
+
if (htmlElement) {
|
|
107
|
+
element.setDOMContent(htmlElement);
|
|
108
|
+
}
|
|
103
109
|
break;
|
|
104
110
|
}
|
|
105
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["maplibregl","getHTMLElementDescriptorListenerName","isWebObjectListenerOnHTMLElement","isWebObjectListenerOnMapLayer","isWebObjectListenerOnObject","stableStringify","MAP_OPTIONS_THAT_ARE_HTML_ELEMENTS","MAP_OPTIONS_THAT_ARE_WEB_FUNCTIONS","MARKER_OPTIONS_THAT_ARE_HTML_ELEMENTS","MARKER_OPTIONS_THAT_ARE_WEB_FUNCTIONS","POPUP_OPTIONS_THAT_ARE_HTML_ELEMENTS","POPUP_OPTIONS_THAT_ARE_WEB_FUNCTIONS","WebObjectsController","objects","Map","objectsOptions","mapId","map","get","Error","addExistingObjectsToMap","reactNativeBridge","entries","forEach","id","object","addTo","sendEventToReactNative","handleMountMessage","message","element","addObject","payload","objectId","objectType","options","setObjectListeners","listeners","set","handleUpdateMessage","updateObject","handleUnmountMessage","removeObject","delete","handleMethodCall","result","runIfSpecialMethod","runNormalMethod","JSON","stringify","error","postMessage","type","requestId","#addObject","resolveDescriptorsInOptions","htmlContainer","document","getElementById","container","Marker","setLngLat","coordinate","htmlElement","createElement","Popup","setDOMContent","#updateObject","oldOptionsAsString","newOptionsAsString","#removeObject","remove","#setObjectListeners","Object","eventName","listener","on","event","layerId","getElement","addEventListener","stopPropagation","#runIfSpecialMethod","objetId","method","image","loadImage","args","addImage","data","at","parentId","parent","setEventedParent","popupId","popup","setPopup","buildHTMLElementFromDescriptor","#runNormalMethod","#resolveDescriptorsInOptions","optionsThatAreFunctions","optionsThatAreHTMLElements","Array","isArray","opt","resolved","key","includes","window","#buildHTMLElementFromDescriptor","descriptor","undefined","innerHTML","target","closest","cssSelector","#sendEventToReactNative"],"sourceRoot":"../../../../src","sources":["web/controllers/WebObjectsController.ts"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["maplibregl","getHTMLElementDescriptorListenerName","isWebObjectListenerOnHTMLElement","isWebObjectListenerOnMapLayer","isWebObjectListenerOnObject","stableStringify","MAP_OPTIONS_THAT_ARE_HTML_ELEMENTS","MAP_OPTIONS_THAT_ARE_WEB_FUNCTIONS","MARKER_OPTIONS_THAT_ARE_HTML_ELEMENTS","MARKER_OPTIONS_THAT_ARE_WEB_FUNCTIONS","POPUP_OPTIONS_THAT_ARE_HTML_ELEMENTS","POPUP_OPTIONS_THAT_ARE_WEB_FUNCTIONS","WebObjectsController","objects","Map","objectsOptions","mapId","map","get","Error","addExistingObjectsToMap","reactNativeBridge","entries","forEach","id","object","addTo","sendEventToReactNative","handleMountMessage","message","element","addObject","payload","objectId","objectType","options","setObjectListeners","listeners","set","handleUpdateMessage","updateObject","handleUnmountMessage","removeObject","delete","handleMethodCall","result","runIfSpecialMethod","runNormalMethod","JSON","stringify","error","postMessage","type","requestId","#addObject","resolveDescriptorsInOptions","htmlContainer","document","getElementById","container","Marker","setLngLat","coordinate","htmlElement","popupOptions","Popup","setDOMContent","#updateObject","oldOptionsAsString","newOptionsAsString","#removeObject","remove","#setObjectListeners","Object","eventName","listener","on","event","layerId","getElement","addEventListener","stopPropagation","#runIfSpecialMethod","objetId","method","image","loadImage","args","addImage","data","at","parentId","parent","setEventedParent","popupId","popup","setPopup","buildHTMLElementFromDescriptor","#runNormalMethod","#resolveDescriptorsInOptions","optionsThatAreFunctions","optionsThatAreHTMLElements","Array","isArray","opt","resolved","key","includes","window","#buildHTMLElementFromDescriptor","descriptor","undefined","createElement","innerHTML","target","closest","cssSelector","#sendEventToReactNative"],"sourceRoot":"../../../../src","sources":["web/controllers/WebObjectsController.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -24191,8 +24191,11 @@ uniform mat4 u_projection_matrix;
|
|
|
24191
24191
|
POPUP_OPTIONS_THAT_ARE_WEB_FUNCTIONS,
|
|
24192
24192
|
POPUP_OPTIONS_THAT_ARE_HTML_ELEMENTS
|
|
24193
24193
|
);
|
|
24194
|
-
const htmlElement = options
|
|
24195
|
-
element = new import_maplibre_gl4.default.Popup(
|
|
24194
|
+
const { element: htmlElement, ...popupOptions } = options;
|
|
24195
|
+
element = new import_maplibre_gl4.default.Popup(popupOptions);
|
|
24196
|
+
if (htmlElement) {
|
|
24197
|
+
element.setDOMContent(htmlElement);
|
|
24198
|
+
}
|
|
24196
24199
|
break;
|
|
24197
24200
|
}
|
|
24198
24201
|
}
|