@r2digisolutions/components 0.19.20 → 0.19.22
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/dist/components/atoms/Textarea/Textarea.svelte +4 -0
- package/dist/components/atoms/Textarea/Textarea.svelte.d.ts +1 -0
- package/dist/components/molecules/CanvasInspector/CanvasInspector.svelte +165 -71
- package/dist/components/molecules/Cascader/Cascader.svelte +2 -0
- package/dist/components/molecules/ColorPicker/ColorPicker.svelte +4 -13
- package/dist/components/molecules/DatePicker/DatePicker.svelte +2 -0
- package/dist/components/molecules/DateTimePicker/DateTimePicker.svelte +2 -0
- package/dist/components/molecules/DropdownMenu/DropdownMenu.svelte +12 -21
- package/dist/components/molecules/MediaLayerItem/MediaLayerItem.svelte +11 -3
- package/dist/components/molecules/MediaLayerItem/MediaLayerItem.svelte.d.ts +5 -1
- package/dist/components/molecules/MediaLayerList/MediaLayerList.svelte +31 -4
- package/dist/components/molecules/MediaStage/MediaStage.svelte +193 -164
- package/dist/components/molecules/MediaStage/MediaStage.svelte.d.ts +1 -45
- package/dist/components/molecules/MultiSelect/MultiSelect.svelte +2 -0
- package/dist/components/molecules/Popover/Popover.svelte +6 -0
- package/dist/components/molecules/Select/Select.svelte +36 -14
- package/dist/components/molecules/TimePicker/TimePicker.svelte +2 -0
- package/dist/components/molecules/TreeSelect/TreeSelect.svelte +2 -0
- package/dist/components/molecules/UserMenu/UserMenu.svelte +2 -0
- package/dist/components/organisms/CanvasEditor/CanvasEditor.svelte +155 -147
- package/dist/components/organisms/Dialog/Dialog.svelte +19 -3
- package/dist/components/organisms/Menubar/Menubar.svelte +121 -43
- package/dist/components/organisms/Menubar/Menubar.svelte.d.ts +1 -1
- package/dist/components/organisms/NotificationCenter/NotificationCenter.svelte +2 -0
- package/dist/components/organisms/PricingTable/PricingTable.svelte +3 -3
- package/dist/index.d.ts +2 -1
- package/dist/index.js +2 -1
- package/dist/utils/canvasHierarchy.d.ts +33 -0
- package/dist/utils/canvasHierarchy.js +108 -13
- package/dist/utils/popoverInvoker.d.ts +11 -0
- package/dist/utils/popoverInvoker.js +39 -0
- package/package.json +1 -1
|
@@ -27,14 +27,23 @@ export const LAYOUT_BOX_KINDS = new Set([
|
|
|
27
27
|
'uniformGrid',
|
|
28
28
|
'scrollBox'
|
|
29
29
|
]);
|
|
30
|
+
/** Parents that own child X/Y (UMG slot layout). Group / panel / overlay stay freeform. */
|
|
31
|
+
export const LAYOUT_POSITION_KINDS = new Set([
|
|
32
|
+
'hBox',
|
|
33
|
+
'vBox',
|
|
34
|
+
'wrapBox',
|
|
35
|
+
'uniformGrid'
|
|
36
|
+
]);
|
|
37
|
+
/** Parents that own child W/H (cell / uniform scale). */
|
|
38
|
+
export const LAYOUT_SIZE_KINDS = new Set(['uniformGrid', 'scaleBox']);
|
|
30
39
|
/**
|
|
31
40
|
* Structural shells whose empty area should start a marquee (not a layer drag),
|
|
32
41
|
* matching Figma-style select-drag on the canvas / inside frames.
|
|
42
|
+
* Groups are omitted: they behave like a single object (click/drag the group).
|
|
33
43
|
*/
|
|
34
44
|
export const MARQUEE_PASS_KINDS = new Set([
|
|
35
45
|
'canvasPanel',
|
|
36
46
|
'overlay',
|
|
37
|
-
'group',
|
|
38
47
|
...LAYOUT_BOX_KINDS
|
|
39
48
|
]);
|
|
40
49
|
export function isContainerKind(kind) {
|
|
@@ -78,6 +87,11 @@ export function getAncestors(layers, layerId) {
|
|
|
78
87
|
}
|
|
79
88
|
return out;
|
|
80
89
|
}
|
|
90
|
+
/** Outermost `group` ancestor, or null if the layer is not inside a group. */
|
|
91
|
+
export function enclosingGroupId(layers, layerId) {
|
|
92
|
+
const groups = getAncestors(layers, layerId).filter((a) => a.kind === 'group');
|
|
93
|
+
return groups.length ? groups[groups.length - 1].id : null;
|
|
94
|
+
}
|
|
81
95
|
/** True when the layer and every ancestor is visible (flat stage paint must check this). */
|
|
82
96
|
export function isEffectivelyVisible(layers, layerId, map) {
|
|
83
97
|
const byId = map ?? new Map(layers.map((l) => [l.id, l]));
|
|
@@ -89,6 +103,50 @@ export function isEffectivelyVisible(layers, layerId, map) {
|
|
|
89
103
|
}
|
|
90
104
|
return true;
|
|
91
105
|
}
|
|
106
|
+
/** True when the layer or any ancestor is locked (parent lock freezes the whole subtree). */
|
|
107
|
+
export function isEffectivelyLocked(layers, layerId, map) {
|
|
108
|
+
const byId = map ?? new Map(layers.map((l) => [l.id, l]));
|
|
109
|
+
let cur = byId.get(layerId);
|
|
110
|
+
while (cur) {
|
|
111
|
+
if (cur.locked)
|
|
112
|
+
return true;
|
|
113
|
+
cur = cur.parentId ? byId.get(cur.parentId) : undefined;
|
|
114
|
+
}
|
|
115
|
+
return false;
|
|
116
|
+
}
|
|
117
|
+
function parentOf(layers, layerId, map) {
|
|
118
|
+
const byId = map ?? new Map(layers.map((l) => [l.id, l]));
|
|
119
|
+
const layer = byId.get(layerId);
|
|
120
|
+
return layer?.parentId ? byId.get(layer.parentId) : undefined;
|
|
121
|
+
}
|
|
122
|
+
/** Child X/Y is owned by an hBox / vBox / wrap / grid parent. */
|
|
123
|
+
export function isLayoutPositionLocked(layers, layerId, map) {
|
|
124
|
+
const parent = parentOf(layers, layerId, map);
|
|
125
|
+
return !!parent && LAYOUT_POSITION_KINDS.has(parent.kind);
|
|
126
|
+
}
|
|
127
|
+
/** Child W/H is owned by a grid / scaleBox parent. */
|
|
128
|
+
export function isLayoutSizeLocked(layers, layerId, map) {
|
|
129
|
+
const parent = parentOf(layers, layerId, map);
|
|
130
|
+
return !!parent && LAYOUT_SIZE_KINDS.has(parent.kind);
|
|
131
|
+
}
|
|
132
|
+
/**
|
|
133
|
+
* Ancestors to draw while a nested layer is selected (UMG / Canva parent chrome).
|
|
134
|
+
* Skips `canvasPanel` (full-bleed artboard) and layers already in the selection.
|
|
135
|
+
*/
|
|
136
|
+
export function selectionAncestorIds(layers, selectedIds) {
|
|
137
|
+
const selected = new Set(selectedIds);
|
|
138
|
+
const out = [];
|
|
139
|
+
const seen = new Set();
|
|
140
|
+
for (const id of selectedIds) {
|
|
141
|
+
for (const anc of getAncestors(layers, id)) {
|
|
142
|
+
if (selected.has(anc.id) || seen.has(anc.id) || anc.kind === 'canvasPanel')
|
|
143
|
+
continue;
|
|
144
|
+
seen.add(anc.id);
|
|
145
|
+
out.push(anc.id);
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
return out;
|
|
149
|
+
}
|
|
92
150
|
/**
|
|
93
151
|
* CSS transform for a flat-stage layer so ancestor rotations orbit children
|
|
94
152
|
* around each ancestor's center (DOM is not nested).
|
|
@@ -179,6 +237,43 @@ export function slotFromLocalRect(parentSize, rect, anchors = ANCHOR_PRESETS.top
|
|
|
179
237
|
}
|
|
180
238
|
};
|
|
181
239
|
}
|
|
240
|
+
/**
|
|
241
|
+
* Translate a UMG slot without changing size.
|
|
242
|
+
* `right` / `bottom` are inverted (distance from the opposite anchored edge).
|
|
243
|
+
*/
|
|
244
|
+
export function translateSlot(slot, dx, dy) {
|
|
245
|
+
if (!dx && !dy)
|
|
246
|
+
return slot;
|
|
247
|
+
return {
|
|
248
|
+
...slot,
|
|
249
|
+
offsets: {
|
|
250
|
+
left: slot.offsets.left + dx,
|
|
251
|
+
right: slot.offsets.right - dx,
|
|
252
|
+
top: slot.offsets.top + dy,
|
|
253
|
+
bottom: slot.offsets.bottom - dy
|
|
254
|
+
}
|
|
255
|
+
};
|
|
256
|
+
}
|
|
257
|
+
/**
|
|
258
|
+
* Keyboard nudge along one axis.
|
|
259
|
+
* With snap: land on the next/previous grid line (if already on-grid, move one cell; Shift = two).
|
|
260
|
+
*/
|
|
261
|
+
export function stepAxis(value, dir, opts) {
|
|
262
|
+
const cell = opts.cell;
|
|
263
|
+
if (!opts.snap || cell <= 0)
|
|
264
|
+
return value + dir * (opts.coarse ? 10 : 1);
|
|
265
|
+
const step = opts.coarse ? cell * 2 : cell;
|
|
266
|
+
const eps = 1e-6;
|
|
267
|
+
const onGrid = Math.abs(value - Math.round(value / cell) * cell) < eps;
|
|
268
|
+
if (dir > 0) {
|
|
269
|
+
if (onGrid)
|
|
270
|
+
return value + step;
|
|
271
|
+
return Math.ceil((value + eps) / cell) * cell;
|
|
272
|
+
}
|
|
273
|
+
if (onGrid)
|
|
274
|
+
return value - step;
|
|
275
|
+
return Math.floor((value - eps) / cell) * cell;
|
|
276
|
+
}
|
|
182
277
|
export function contentPadding(layer) {
|
|
183
278
|
const p = layer.slot?.padding;
|
|
184
279
|
return {
|
|
@@ -217,7 +312,9 @@ export function computeAbsoluteRects(layers, rootSize) {
|
|
|
217
312
|
return;
|
|
218
313
|
const parentW = parentAbs?.w ?? rootSize.width;
|
|
219
314
|
const parentH = parentAbs?.h ?? rootSize.height;
|
|
220
|
-
const pad = parentLayer
|
|
315
|
+
const pad = parentLayer
|
|
316
|
+
? contentPadding(parentLayer)
|
|
317
|
+
: { left: 0, top: 0, right: 0, bottom: 0 };
|
|
221
318
|
const originX = (parentAbs?.x ?? 0) + pad.left;
|
|
222
319
|
const originY = (parentAbs?.y ?? 0) + pad.top;
|
|
223
320
|
const contentW = Math.max(0, parentW - pad.left - pad.right);
|
|
@@ -490,6 +587,7 @@ export function reparentLayer(layers, layerId, newParentId, rootSize) {
|
|
|
490
587
|
}
|
|
491
588
|
: l);
|
|
492
589
|
}
|
|
590
|
+
/** Wrap one or more layers in a new parent (`group`, `hBox`, `border`, …). */
|
|
493
591
|
export function wrapSelection(doc, selectedIds, wrapKind = 'group') {
|
|
494
592
|
if (!selectedIds.length)
|
|
495
593
|
return null;
|
|
@@ -499,7 +597,7 @@ export function wrapSelection(doc, selectedIds, wrapKind = 'group') {
|
|
|
499
597
|
// Exclude descendants when parent+child are both selected
|
|
500
598
|
let selected = layers.filter((l) => set.has(l.id));
|
|
501
599
|
selected = selected.filter((l) => !selected.some((other) => other.id !== l.id && isDescendant(layers, l.id, other.id)));
|
|
502
|
-
if (selected.length
|
|
600
|
+
if (!selected.length)
|
|
503
601
|
return null;
|
|
504
602
|
const wrapIds = selected.map((l) => l.id);
|
|
505
603
|
// Only wrap siblings that share the same parent — otherwise lift to root first
|
|
@@ -509,7 +607,9 @@ export function wrapSelection(doc, selectedIds, wrapKind = 'group') {
|
|
|
509
607
|
layers = reparentLayer(layers, id, null, rootSize);
|
|
510
608
|
}
|
|
511
609
|
parentId = null;
|
|
512
|
-
selected = wrapIds
|
|
610
|
+
selected = wrapIds
|
|
611
|
+
.map((id) => layers.find((l) => l.id === id))
|
|
612
|
+
.filter(Boolean);
|
|
513
613
|
}
|
|
514
614
|
const absMap = computeAbsoluteRects(layers, rootSize);
|
|
515
615
|
let minX = Infinity;
|
|
@@ -619,18 +719,13 @@ export function duplicateSubtree(doc, rootIds, offset = { x: 16, y: 16 }) {
|
|
|
619
719
|
? (layer.parentId ?? null)
|
|
620
720
|
: (layer.parentId ?? null);
|
|
621
721
|
let rect = { ...layer.rect };
|
|
622
|
-
let slot = layer.slot
|
|
722
|
+
let slot = layer.slot
|
|
723
|
+
? { ...layer.slot, anchors: { ...layer.slot.anchors }, offsets: { ...layer.slot.offsets } }
|
|
724
|
+
: undefined;
|
|
623
725
|
if (isRoot) {
|
|
624
726
|
rect = { ...rect, x: rect.x + offset.x, y: rect.y + offset.y };
|
|
625
727
|
if (slot) {
|
|
626
|
-
slot =
|
|
627
|
-
...slot,
|
|
628
|
-
offsets: {
|
|
629
|
-
...slot.offsets,
|
|
630
|
-
left: slot.offsets.left + offset.x,
|
|
631
|
-
top: slot.offsets.top + offset.y
|
|
632
|
-
}
|
|
633
|
-
};
|
|
728
|
+
slot = translateSlot(slot, offset.x, offset.y);
|
|
634
729
|
}
|
|
635
730
|
}
|
|
636
731
|
return {
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { Attachment } from 'svelte/attachments';
|
|
2
|
+
/**
|
|
3
|
+
* Second click on a popover invoker must close it.
|
|
4
|
+
*
|
|
5
|
+
* `popover="auto"` light-dismisses when the trigger (outside the panel) is
|
|
6
|
+
* clicked, then `popovertargetaction="toggle"` / a custom `onclick` opens it
|
|
7
|
+
* again. Remember "was open" on pointerdown and cancel that reopen.
|
|
8
|
+
*/
|
|
9
|
+
export declare function bindPopoverInvokerToggle(trigger: HTMLElement, getPanel: () => HTMLElement | null | undefined): () => void;
|
|
10
|
+
/** `{@attach popoverInvokerToggle(() => panelEl)}` on a popover invoker button. */
|
|
11
|
+
export declare function popoverInvokerToggle(getPanel: () => HTMLElement | null | undefined): Attachment<HTMLElement>;
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Second click on a popover invoker must close it.
|
|
3
|
+
*
|
|
4
|
+
* `popover="auto"` light-dismisses when the trigger (outside the panel) is
|
|
5
|
+
* clicked, then `popovertargetaction="toggle"` / a custom `onclick` opens it
|
|
6
|
+
* again. Remember "was open" on pointerdown and cancel that reopen.
|
|
7
|
+
*/
|
|
8
|
+
export function bindPopoverInvokerToggle(trigger, getPanel) {
|
|
9
|
+
let closeOnClick = false;
|
|
10
|
+
const onPointerDown = () => {
|
|
11
|
+
closeOnClick = !!getPanel()?.matches(':popover-open');
|
|
12
|
+
};
|
|
13
|
+
const onClick = (event) => {
|
|
14
|
+
if (!closeOnClick)
|
|
15
|
+
return;
|
|
16
|
+
closeOnClick = false;
|
|
17
|
+
event.preventDefault();
|
|
18
|
+
event.stopImmediatePropagation();
|
|
19
|
+
const panel = getPanel();
|
|
20
|
+
if (panel?.matches(':popover-open')) {
|
|
21
|
+
try {
|
|
22
|
+
panel.hidePopover();
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
/* ignore */
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
};
|
|
29
|
+
trigger.addEventListener('pointerdown', onPointerDown, true);
|
|
30
|
+
trigger.addEventListener('click', onClick, true);
|
|
31
|
+
return () => {
|
|
32
|
+
trigger.removeEventListener('pointerdown', onPointerDown, true);
|
|
33
|
+
trigger.removeEventListener('click', onClick, true);
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
/** `{@attach popoverInvokerToggle(() => panelEl)}` on a popover invoker button. */
|
|
37
|
+
export function popoverInvokerToggle(getPanel) {
|
|
38
|
+
return (node) => bindPopoverInvokerToggle(node, getPanel);
|
|
39
|
+
}
|