@fragmentsx/render-react 1.6.0 → 1.6.1
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useReadVariables.d.ts","sourceRoot":"","sources":["../../../src/hooks/layer/useReadVariables.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,UAAU,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAuBrE,eAAO,MAAM,gBAAgB,iBACb,OAAO,EAAE,kBACP,UAAU,GAAG,IAAI;;;
|
|
1
|
+
{"version":3,"file":"useReadVariables.d.ts","sourceRoot":"","sources":["../../../src/hooks/layer/useReadVariables.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,UAAU,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAuBrE,eAAO,MAAM,gBAAgB,iBACb,OAAO,EAAE,kBACP,UAAU,GAAG,IAAI;;;GAiHlC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useExtractProps.d.ts","sourceRoot":"","sources":["../../../src/hooks/utils/useExtractProps.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAe,OAAO,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"useExtractProps.d.ts","sourceRoot":"","sources":["../../../src/hooks/utils/useExtractProps.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAe,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAwMrE;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,eAAe,UACnB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,YACpB,UAAU,kBACJ,UAAU,gBACZ,OAAO,EAAE,KACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAkQxB,CAAC"}
|
package/dist/index.cjs.js
CHANGED
|
@@ -885,10 +885,14 @@ const useReadVariables = (variableKeys, customManager) => {
|
|
|
885
885
|
const areaManager = react.useContext(AreaManagerContext);
|
|
886
886
|
const scopes = react.useContext(ScopeContext);
|
|
887
887
|
const resultManager = customManager ?? ((_a = react.useContext(InstanceContext)) == null ? void 0 : _a.innerManager) ?? fragmentManager;
|
|
888
|
-
const
|
|
889
|
-
|
|
890
|
-
|
|
891
|
-
|
|
888
|
+
const safeFilterKeys = resultManager ? filterKeys : [];
|
|
889
|
+
const variableLayers = react$1.useGraphStack(
|
|
890
|
+
safeFilterKeys.length ? resultManager : null,
|
|
891
|
+
safeFilterKeys,
|
|
892
|
+
{
|
|
893
|
+
selector: (graph) => graph ? utils.pick(graph, "_id", "defaultValue", "required") : graph
|
|
894
|
+
}
|
|
895
|
+
);
|
|
892
896
|
react$1.useGraph(globalManager, (_b = globalManager == null ? void 0 : globalManager.$properties) == null ? void 0 : _b.key);
|
|
893
897
|
react$1.useGraph(areaManager, (_c = areaManager == null ? void 0 : areaManager.$properties) == null ? void 0 : _c.key);
|
|
894
898
|
const globalPropertyKeys = react.useMemo(() => {
|
|
@@ -2348,6 +2352,7 @@ const buildFieldIdMapping = (childDef, parentDef, childManager, parentManager) =
|
|
|
2348
2352
|
continue;
|
|
2349
2353
|
}
|
|
2350
2354
|
mapping[parentFieldVar._id] = childFieldVar._id;
|
|
2355
|
+
mapping[fieldName] = childFieldVar._id;
|
|
2351
2356
|
}
|
|
2352
2357
|
return mapping;
|
|
2353
2358
|
};
|
|
@@ -2379,6 +2384,8 @@ const remapArrayItems = (items, mapping) => {
|
|
|
2379
2384
|
});
|
|
2380
2385
|
};
|
|
2381
2386
|
const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
2387
|
+
const areaManager = react.useContext(AreaManagerContext);
|
|
2388
|
+
const globalManager = react.useContext(GlobalManagerContext);
|
|
2382
2389
|
const arrayVariableKeys = react.useMemo(() => {
|
|
2383
2390
|
if (!manager || !(definitions == null ? void 0 : definitions.length)) return [];
|
|
2384
2391
|
const keys = [];
|
|
@@ -2397,8 +2404,9 @@ const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
|
2397
2404
|
const arrayResolvedResults = useReadVariables(arrayVariableKeys);
|
|
2398
2405
|
const arrayResolvedByKey = {};
|
|
2399
2406
|
arrayVariableKeys.forEach((key, i) => {
|
|
2400
|
-
var _a;
|
|
2407
|
+
var _a, _b;
|
|
2401
2408
|
arrayResolvedByKey[key] = ((_a = arrayResolvedResults[i]) == null ? void 0 : _a.value) ?? null;
|
|
2409
|
+
((_b = arrayResolvedResults[i]) == null ? void 0 : _b.layer) ?? null;
|
|
2402
2410
|
});
|
|
2403
2411
|
const leafKeys = react.useMemo(() => {
|
|
2404
2412
|
if (!manager || !(definitions == null ? void 0 : definitions.length)) return [];
|
|
@@ -2418,12 +2426,12 @@ const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
|
2418
2426
|
return keys;
|
|
2419
2427
|
}, [definitions, manager]);
|
|
2420
2428
|
const leafLayers = react$1.useGraphStack(leafKeys.length ? manager : null, leafKeys);
|
|
2421
|
-
const arrayItemKeys = react.useMemo(() => {
|
|
2429
|
+
const { arrayItemKeys, arrayItemManager } = react.useMemo(() => {
|
|
2422
2430
|
var _a;
|
|
2423
|
-
if (!manager || !(definitions == null ? void 0 : definitions.length))
|
|
2424
|
-
|
|
2425
|
-
if (!resolveManager) return [];
|
|
2431
|
+
if (!manager || !(definitions == null ? void 0 : definitions.length))
|
|
2432
|
+
return { arrayItemKeys: [], arrayItemManager: null };
|
|
2426
2433
|
const keys = [];
|
|
2434
|
+
let itemManager = null;
|
|
2427
2435
|
for (const defKey of definitions) {
|
|
2428
2436
|
const defVar = manager.resolve(defKey);
|
|
2429
2437
|
if (!(defVar == null ? void 0 : defVar._id)) continue;
|
|
@@ -2431,14 +2439,17 @@ const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
|
2431
2439
|
continue;
|
|
2432
2440
|
const propValue = props[defVar._id];
|
|
2433
2441
|
if (!definition.isVariableLink(propValue)) continue;
|
|
2434
|
-
const
|
|
2442
|
+
const resolveManager = parentManager ?? manager;
|
|
2443
|
+
const parentVar = (resolveManager == null ? void 0 : resolveManager.resolve(propValue)) ?? (areaManager == null ? void 0 : areaManager.resolve(propValue)) ?? (globalManager == null ? void 0 : globalManager.resolve(propValue));
|
|
2444
|
+
const ownerManager = (resolveManager == null ? void 0 : resolveManager.resolve(propValue)) ? resolveManager : (areaManager == null ? void 0 : areaManager.resolve(propValue)) ? areaManager : (globalManager == null ? void 0 : globalManager.resolve(propValue)) ? globalManager : null;
|
|
2435
2445
|
if ((parentVar == null ? void 0 : parentVar.type) !== definition.definition.variableType.Array) continue;
|
|
2436
2446
|
const items = parentVar.defaultValue;
|
|
2437
2447
|
if (!Array.isArray(items)) continue;
|
|
2448
|
+
if (ownerManager) itemManager = ownerManager;
|
|
2438
2449
|
for (const item of items) {
|
|
2439
2450
|
if (definition.isLink(item)) {
|
|
2440
2451
|
keys.push(item);
|
|
2441
|
-
const resolved =
|
|
2452
|
+
const resolved = ownerManager == null ? void 0 : ownerManager.resolve(item);
|
|
2442
2453
|
if ((resolved == null ? void 0 : resolved.value) && utils.isObject(resolved.value) && ((_a = resolved.value) == null ? void 0 : _a._type)) {
|
|
2443
2454
|
const valueKey = core.keyOfEntity(resolved.value);
|
|
2444
2455
|
if (valueKey) keys.push(valueKey);
|
|
@@ -2446,13 +2457,14 @@ const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
|
2446
2457
|
}
|
|
2447
2458
|
}
|
|
2448
2459
|
}
|
|
2449
|
-
return keys;
|
|
2450
|
-
}, [definitions, manager, parentManager, props]);
|
|
2460
|
+
return { arrayItemKeys: keys, arrayItemManager: itemManager };
|
|
2461
|
+
}, [definitions, manager, parentManager, areaManager, globalManager, props]);
|
|
2451
2462
|
const arrayItemLayers = react$1.useGraphStack(
|
|
2452
|
-
arrayItemKeys.length ? parentManager ?? manager : null,
|
|
2463
|
+
arrayItemKeys.length ? arrayItemManager ?? parentManager ?? manager : null,
|
|
2453
2464
|
arrayItemKeys
|
|
2454
2465
|
);
|
|
2455
2466
|
return react.useMemo(() => {
|
|
2467
|
+
var _a;
|
|
2456
2468
|
if (!manager || !(definitions == null ? void 0 : definitions.length)) return props;
|
|
2457
2469
|
const resolveManager = parentManager ?? manager;
|
|
2458
2470
|
const base = {};
|
|
@@ -2483,26 +2495,22 @@ const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
|
2483
2495
|
continue;
|
|
2484
2496
|
}
|
|
2485
2497
|
if (defVar.type === definition.definition.variableType.Array && defVar.definition) {
|
|
2486
|
-
if (definition.isVariableLink(propValue)
|
|
2487
|
-
const parentVar = resolveManager.resolve(propValue);
|
|
2498
|
+
if (definition.isVariableLink(propValue)) {
|
|
2499
|
+
const parentVar = (resolveManager == null ? void 0 : resolveManager.resolve(propValue)) ?? (areaManager == null ? void 0 : areaManager.resolve(propValue)) ?? (globalManager == null ? void 0 : globalManager.resolve(propValue));
|
|
2500
|
+
const parentVarManager = (resolveManager == null ? void 0 : resolveManager.resolve(propValue)) ? resolveManager : (areaManager == null ? void 0 : areaManager.resolve(propValue)) ? areaManager : (globalManager == null ? void 0 : globalManager.resolve(propValue)) ? globalManager : resolveManager;
|
|
2488
2501
|
if ((parentVar == null ? void 0 : parentVar.type) === definition.definition.variableType.Array && (parentVar == null ? void 0 : parentVar.definition)) {
|
|
2489
2502
|
const resolvedArray = arrayResolvedByKey[propValue];
|
|
2490
2503
|
if (Array.isArray(resolvedArray)) {
|
|
2491
|
-
const
|
|
2492
|
-
|
|
2493
|
-
resolveManager
|
|
2494
|
-
);
|
|
2504
|
+
const itemResolver = parentVarManager ?? resolveManager;
|
|
2505
|
+
const concreteItems = itemResolver ? resolveArrayItems(resolvedArray, itemResolver) : [];
|
|
2495
2506
|
const childDef = resolveFieldRef(defVar.definition, manager);
|
|
2496
|
-
const parentDef = resolveFieldRef(
|
|
2497
|
-
parentVar.definition,
|
|
2498
|
-
resolveManager
|
|
2499
|
-
);
|
|
2507
|
+
const parentDef = parentVarManager ? resolveFieldRef(parentVar.definition, parentVarManager) : utils.isObject(parentVar.definition) && ((_a = parentVar.definition) == null ? void 0 : _a._id) ? parentVar.definition : null;
|
|
2500
2508
|
if ((childDef == null ? void 0 : childDef.type) === definition.definition.variableType.Object && (childDef == null ? void 0 : childDef.fields) && (parentDef == null ? void 0 : parentDef.type) === definition.definition.variableType.Object && (parentDef == null ? void 0 : parentDef.fields)) {
|
|
2501
2509
|
const mapping = buildFieldIdMapping(
|
|
2502
2510
|
childDef,
|
|
2503
2511
|
parentDef,
|
|
2504
2512
|
manager,
|
|
2505
|
-
resolveManager
|
|
2513
|
+
parentVarManager ?? resolveManager
|
|
2506
2514
|
);
|
|
2507
2515
|
expanded[defVar._id] = remapArrayItems(concreteItems, mapping);
|
|
2508
2516
|
} else {
|
|
@@ -2532,6 +2540,8 @@ const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
|
2532
2540
|
props,
|
|
2533
2541
|
manager,
|
|
2534
2542
|
parentManager,
|
|
2543
|
+
areaManager,
|
|
2544
|
+
globalManager,
|
|
2535
2545
|
definitions
|
|
2536
2546
|
]);
|
|
2537
2547
|
};
|
|
@@ -3395,16 +3405,16 @@ const AreaInitial = (areaProps) => {
|
|
|
3395
3405
|
() => ({ ...(areaData == null ? void 0 : areaData.props) ?? {}, ...(areaProps == null ? void 0 : areaProps.props) ?? {} }),
|
|
3396
3406
|
[areaData, areaProps]
|
|
3397
3407
|
);
|
|
3398
|
-
if (!areaData) return null;
|
|
3399
3408
|
const areaManager = react.useMemo(
|
|
3400
3409
|
() => clientCore.createAreaManager({
|
|
3401
|
-
areaId: areaData.areaId,
|
|
3402
|
-
campaignId: areaData.campaignId,
|
|
3403
|
-
variantId: areaData.variantId,
|
|
3404
|
-
areaProperties: areaData.areaProperties
|
|
3410
|
+
areaId: areaData == null ? void 0 : areaData.areaId,
|
|
3411
|
+
campaignId: areaData == null ? void 0 : areaData.campaignId,
|
|
3412
|
+
variantId: areaData == null ? void 0 : areaData.variantId,
|
|
3413
|
+
areaProperties: areaData == null ? void 0 : areaData.areaProperties
|
|
3405
3414
|
}),
|
|
3406
|
-
[areaData.areaId]
|
|
3415
|
+
[areaData == null ? void 0 : areaData.areaId]
|
|
3407
3416
|
);
|
|
3417
|
+
if (!areaData) return null;
|
|
3408
3418
|
return /* @__PURE__ */ jsxRuntime.jsx(AreaManagerProvider, { value: areaManager, children: /* @__PURE__ */ jsxRuntime.jsx(
|
|
3409
3419
|
Scope,
|
|
3410
3420
|
{
|
package/dist/index.es.js
CHANGED
|
@@ -883,10 +883,14 @@ const useReadVariables = (variableKeys, customManager) => {
|
|
|
883
883
|
const areaManager = useContext(AreaManagerContext);
|
|
884
884
|
const scopes = useContext(ScopeContext);
|
|
885
885
|
const resultManager = customManager ?? ((_a = useContext(InstanceContext)) == null ? void 0 : _a.innerManager) ?? fragmentManager;
|
|
886
|
-
const
|
|
887
|
-
|
|
888
|
-
|
|
889
|
-
|
|
886
|
+
const safeFilterKeys = resultManager ? filterKeys : [];
|
|
887
|
+
const variableLayers = useGraphStack(
|
|
888
|
+
safeFilterKeys.length ? resultManager : null,
|
|
889
|
+
safeFilterKeys,
|
|
890
|
+
{
|
|
891
|
+
selector: (graph) => graph ? pick(graph, "_id", "defaultValue", "required") : graph
|
|
892
|
+
}
|
|
893
|
+
);
|
|
890
894
|
useGraph(globalManager, (_b = globalManager == null ? void 0 : globalManager.$properties) == null ? void 0 : _b.key);
|
|
891
895
|
useGraph(areaManager, (_c = areaManager == null ? void 0 : areaManager.$properties) == null ? void 0 : _c.key);
|
|
892
896
|
const globalPropertyKeys = useMemo(() => {
|
|
@@ -2346,6 +2350,7 @@ const buildFieldIdMapping = (childDef, parentDef, childManager, parentManager) =
|
|
|
2346
2350
|
continue;
|
|
2347
2351
|
}
|
|
2348
2352
|
mapping[parentFieldVar._id] = childFieldVar._id;
|
|
2353
|
+
mapping[fieldName] = childFieldVar._id;
|
|
2349
2354
|
}
|
|
2350
2355
|
return mapping;
|
|
2351
2356
|
};
|
|
@@ -2377,6 +2382,8 @@ const remapArrayItems = (items, mapping) => {
|
|
|
2377
2382
|
});
|
|
2378
2383
|
};
|
|
2379
2384
|
const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
2385
|
+
const areaManager = useContext(AreaManagerContext);
|
|
2386
|
+
const globalManager = useContext(GlobalManagerContext);
|
|
2380
2387
|
const arrayVariableKeys = useMemo(() => {
|
|
2381
2388
|
if (!manager || !(definitions == null ? void 0 : definitions.length)) return [];
|
|
2382
2389
|
const keys = [];
|
|
@@ -2395,8 +2402,9 @@ const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
|
2395
2402
|
const arrayResolvedResults = useReadVariables(arrayVariableKeys);
|
|
2396
2403
|
const arrayResolvedByKey = {};
|
|
2397
2404
|
arrayVariableKeys.forEach((key, i) => {
|
|
2398
|
-
var _a;
|
|
2405
|
+
var _a, _b;
|
|
2399
2406
|
arrayResolvedByKey[key] = ((_a = arrayResolvedResults[i]) == null ? void 0 : _a.value) ?? null;
|
|
2407
|
+
((_b = arrayResolvedResults[i]) == null ? void 0 : _b.layer) ?? null;
|
|
2400
2408
|
});
|
|
2401
2409
|
const leafKeys = useMemo(() => {
|
|
2402
2410
|
if (!manager || !(definitions == null ? void 0 : definitions.length)) return [];
|
|
@@ -2416,12 +2424,12 @@ const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
|
2416
2424
|
return keys;
|
|
2417
2425
|
}, [definitions, manager]);
|
|
2418
2426
|
const leafLayers = useGraphStack(leafKeys.length ? manager : null, leafKeys);
|
|
2419
|
-
const arrayItemKeys = useMemo(() => {
|
|
2427
|
+
const { arrayItemKeys, arrayItemManager } = useMemo(() => {
|
|
2420
2428
|
var _a;
|
|
2421
|
-
if (!manager || !(definitions == null ? void 0 : definitions.length))
|
|
2422
|
-
|
|
2423
|
-
if (!resolveManager) return [];
|
|
2429
|
+
if (!manager || !(definitions == null ? void 0 : definitions.length))
|
|
2430
|
+
return { arrayItemKeys: [], arrayItemManager: null };
|
|
2424
2431
|
const keys = [];
|
|
2432
|
+
let itemManager = null;
|
|
2425
2433
|
for (const defKey of definitions) {
|
|
2426
2434
|
const defVar = manager.resolve(defKey);
|
|
2427
2435
|
if (!(defVar == null ? void 0 : defVar._id)) continue;
|
|
@@ -2429,14 +2437,17 @@ const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
|
2429
2437
|
continue;
|
|
2430
2438
|
const propValue = props[defVar._id];
|
|
2431
2439
|
if (!isVariableLink$1(propValue)) continue;
|
|
2432
|
-
const
|
|
2440
|
+
const resolveManager = parentManager ?? manager;
|
|
2441
|
+
const parentVar = (resolveManager == null ? void 0 : resolveManager.resolve(propValue)) ?? (areaManager == null ? void 0 : areaManager.resolve(propValue)) ?? (globalManager == null ? void 0 : globalManager.resolve(propValue));
|
|
2442
|
+
const ownerManager = (resolveManager == null ? void 0 : resolveManager.resolve(propValue)) ? resolveManager : (areaManager == null ? void 0 : areaManager.resolve(propValue)) ? areaManager : (globalManager == null ? void 0 : globalManager.resolve(propValue)) ? globalManager : null;
|
|
2433
2443
|
if ((parentVar == null ? void 0 : parentVar.type) !== definition.variableType.Array) continue;
|
|
2434
2444
|
const items = parentVar.defaultValue;
|
|
2435
2445
|
if (!Array.isArray(items)) continue;
|
|
2446
|
+
if (ownerManager) itemManager = ownerManager;
|
|
2436
2447
|
for (const item of items) {
|
|
2437
2448
|
if (isLink$1(item)) {
|
|
2438
2449
|
keys.push(item);
|
|
2439
|
-
const resolved =
|
|
2450
|
+
const resolved = ownerManager == null ? void 0 : ownerManager.resolve(item);
|
|
2440
2451
|
if ((resolved == null ? void 0 : resolved.value) && isObject(resolved.value) && ((_a = resolved.value) == null ? void 0 : _a._type)) {
|
|
2441
2452
|
const valueKey = keyOfEntity(resolved.value);
|
|
2442
2453
|
if (valueKey) keys.push(valueKey);
|
|
@@ -2444,13 +2455,14 @@ const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
|
2444
2455
|
}
|
|
2445
2456
|
}
|
|
2446
2457
|
}
|
|
2447
|
-
return keys;
|
|
2448
|
-
}, [definitions, manager, parentManager, props]);
|
|
2458
|
+
return { arrayItemKeys: keys, arrayItemManager: itemManager };
|
|
2459
|
+
}, [definitions, manager, parentManager, areaManager, globalManager, props]);
|
|
2449
2460
|
const arrayItemLayers = useGraphStack(
|
|
2450
|
-
arrayItemKeys.length ? parentManager ?? manager : null,
|
|
2461
|
+
arrayItemKeys.length ? arrayItemManager ?? parentManager ?? manager : null,
|
|
2451
2462
|
arrayItemKeys
|
|
2452
2463
|
);
|
|
2453
2464
|
return useMemo(() => {
|
|
2465
|
+
var _a;
|
|
2454
2466
|
if (!manager || !(definitions == null ? void 0 : definitions.length)) return props;
|
|
2455
2467
|
const resolveManager = parentManager ?? manager;
|
|
2456
2468
|
const base = {};
|
|
@@ -2481,26 +2493,22 @@ const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
|
2481
2493
|
continue;
|
|
2482
2494
|
}
|
|
2483
2495
|
if (defVar.type === definition.variableType.Array && defVar.definition) {
|
|
2484
|
-
if (isVariableLink$1(propValue)
|
|
2485
|
-
const parentVar = resolveManager.resolve(propValue);
|
|
2496
|
+
if (isVariableLink$1(propValue)) {
|
|
2497
|
+
const parentVar = (resolveManager == null ? void 0 : resolveManager.resolve(propValue)) ?? (areaManager == null ? void 0 : areaManager.resolve(propValue)) ?? (globalManager == null ? void 0 : globalManager.resolve(propValue));
|
|
2498
|
+
const parentVarManager = (resolveManager == null ? void 0 : resolveManager.resolve(propValue)) ? resolveManager : (areaManager == null ? void 0 : areaManager.resolve(propValue)) ? areaManager : (globalManager == null ? void 0 : globalManager.resolve(propValue)) ? globalManager : resolveManager;
|
|
2486
2499
|
if ((parentVar == null ? void 0 : parentVar.type) === definition.variableType.Array && (parentVar == null ? void 0 : parentVar.definition)) {
|
|
2487
2500
|
const resolvedArray = arrayResolvedByKey[propValue];
|
|
2488
2501
|
if (Array.isArray(resolvedArray)) {
|
|
2489
|
-
const
|
|
2490
|
-
|
|
2491
|
-
resolveManager
|
|
2492
|
-
);
|
|
2502
|
+
const itemResolver = parentVarManager ?? resolveManager;
|
|
2503
|
+
const concreteItems = itemResolver ? resolveArrayItems(resolvedArray, itemResolver) : [];
|
|
2493
2504
|
const childDef = resolveFieldRef(defVar.definition, manager);
|
|
2494
|
-
const parentDef = resolveFieldRef(
|
|
2495
|
-
parentVar.definition,
|
|
2496
|
-
resolveManager
|
|
2497
|
-
);
|
|
2505
|
+
const parentDef = parentVarManager ? resolveFieldRef(parentVar.definition, parentVarManager) : isObject(parentVar.definition) && ((_a = parentVar.definition) == null ? void 0 : _a._id) ? parentVar.definition : null;
|
|
2498
2506
|
if ((childDef == null ? void 0 : childDef.type) === definition.variableType.Object && (childDef == null ? void 0 : childDef.fields) && (parentDef == null ? void 0 : parentDef.type) === definition.variableType.Object && (parentDef == null ? void 0 : parentDef.fields)) {
|
|
2499
2507
|
const mapping = buildFieldIdMapping(
|
|
2500
2508
|
childDef,
|
|
2501
2509
|
parentDef,
|
|
2502
2510
|
manager,
|
|
2503
|
-
resolveManager
|
|
2511
|
+
parentVarManager ?? resolveManager
|
|
2504
2512
|
);
|
|
2505
2513
|
expanded[defVar._id] = remapArrayItems(concreteItems, mapping);
|
|
2506
2514
|
} else {
|
|
@@ -2530,6 +2538,8 @@ const useExtractProps = (props, manager, parentManager, definitions) => {
|
|
|
2530
2538
|
props,
|
|
2531
2539
|
manager,
|
|
2532
2540
|
parentManager,
|
|
2541
|
+
areaManager,
|
|
2542
|
+
globalManager,
|
|
2533
2543
|
definitions
|
|
2534
2544
|
]);
|
|
2535
2545
|
};
|
|
@@ -3393,16 +3403,16 @@ const AreaInitial = (areaProps) => {
|
|
|
3393
3403
|
() => ({ ...(areaData == null ? void 0 : areaData.props) ?? {}, ...(areaProps == null ? void 0 : areaProps.props) ?? {} }),
|
|
3394
3404
|
[areaData, areaProps]
|
|
3395
3405
|
);
|
|
3396
|
-
if (!areaData) return null;
|
|
3397
3406
|
const areaManager = useMemo(
|
|
3398
3407
|
() => createAreaManager({
|
|
3399
|
-
areaId: areaData.areaId,
|
|
3400
|
-
campaignId: areaData.campaignId,
|
|
3401
|
-
variantId: areaData.variantId,
|
|
3402
|
-
areaProperties: areaData.areaProperties
|
|
3408
|
+
areaId: areaData == null ? void 0 : areaData.areaId,
|
|
3409
|
+
campaignId: areaData == null ? void 0 : areaData.campaignId,
|
|
3410
|
+
variantId: areaData == null ? void 0 : areaData.variantId,
|
|
3411
|
+
areaProperties: areaData == null ? void 0 : areaData.areaProperties
|
|
3403
3412
|
}),
|
|
3404
|
-
[areaData.areaId]
|
|
3413
|
+
[areaData == null ? void 0 : areaData.areaId]
|
|
3405
3414
|
);
|
|
3415
|
+
if (!areaData) return null;
|
|
3406
3416
|
return /* @__PURE__ */ jsx(AreaManagerProvider, { value: areaManager, children: /* @__PURE__ */ jsx(
|
|
3407
3417
|
Scope,
|
|
3408
3418
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../../src/nodes/Instance/Instance.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,WAAW,EAKZ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,UAAU,EAAkB,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAc,OAAO,EAAe,MAAM,mBAAmB,CAAC;AAuErE,UAAU,eAAe;IACvB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,aAAc,SAAQ,wBAAwB,CAAC,KAAK,CAAC;IACpE,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,OAAO,UAAU,CAAC,YAAY,CAAC;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CAC9D;
|
|
1
|
+
{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../../src/nodes/Instance/Instance.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,WAAW,EAKZ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,UAAU,EAAkB,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAc,OAAO,EAAe,MAAM,mBAAmB,CAAC;AAuErE,UAAU,eAAe;IACvB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,aAAc,SAAQ,wBAAwB,CAAC,KAAK,CAAC;IACpE,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,YAAY,CAAC,EAAE,MAAM,OAAO,UAAU,CAAC,YAAY,CAAC;IACpD,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,aAAa,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CAC9D;AAkGD,eAAO,MAAM,QAAQ,yDAoBpB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fragmentsx/render-react",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "1.6.
|
|
4
|
+
"version": "1.6.1",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"files": [
|
|
7
7
|
"dist"
|
|
@@ -27,9 +27,9 @@
|
|
|
27
27
|
"@graph-state/core": "^0.13.2",
|
|
28
28
|
"@graph-state/react": "^0.8.3",
|
|
29
29
|
"react-use-measure": "^2.1.7",
|
|
30
|
-
"@fragmentsx/client-core": "0.4.1",
|
|
31
30
|
"@fragmentsx/definition": "0.2.2",
|
|
32
|
-
"@fragmentsx/utils": "0.2.0"
|
|
31
|
+
"@fragmentsx/utils": "0.2.0",
|
|
32
|
+
"@fragmentsx/client-core": "0.4.2"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@testing-library/jest-dom": "^6.6.3",
|