@node-projects/web-component-designer 0.1.218 → 0.1.220
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/commandHandling/IUiCommand.d.ts +1 -0
- package/dist/elements/documentContainer.js +6 -6
- package/dist/elements/documentContainer.js.map +1 -1
- package/dist/elements/helper/Helper.d.ts +1 -0
- package/dist/elements/helper/Helper.js +3 -0
- package/dist/elements/helper/Helper.js.map +1 -1
- package/dist/elements/helper/KeyboardHelper.d.ts +1 -0
- package/dist/elements/helper/KeyboardHelper.js +7 -0
- package/dist/elements/helper/KeyboardHelper.js.map +1 -0
- package/dist/elements/item/DesignItem.d.ts +2 -2
- package/dist/elements/services/DefaultServiceBootstrap.ts.BASE.d.ts +3 -0
- package/dist/elements/services/DefaultServiceBootstrap.ts.BASE.js +216 -0
- package/dist/elements/services/DefaultServiceBootstrap.ts.LOCAL.d.ts +3 -0
- package/dist/elements/services/DefaultServiceBootstrap.ts.LOCAL.js +220 -0
- package/dist/elements/services/DefaultServiceBootstrap.ts.REMOTE.d.ts +3 -0
- package/dist/elements/services/DefaultServiceBootstrap.ts.REMOTE.js +220 -0
- package/dist/elements/services/designItemService/DesignItemService copy.d.ts +7 -0
- package/dist/elements/services/designItemService/DesignItemService copy.js +6 -0
- package/dist/elements/services/placementService/AbsolutePlacementService copy.d.ts +19 -0
- package/dist/elements/services/placementService/AbsolutePlacementService copy.js +155 -0
- package/dist/elements/services/placementService/AbsolutePlacementService.js +3 -2
- package/dist/elements/services/placementService/AbsolutePlacementService.js.map +1 -1
- package/dist/elements/services/placementService/AlwaysAbsolutePlacementService.d.ts +5 -0
- package/dist/elements/services/placementService/AlwaysAbsolutePlacementService.js +7 -0
- package/dist/elements/services/placementService/AlwaysAbsolutePlacementService.js.map +1 -0
- package/dist/elements/services/placementService/DefaultPlacementService.js +3 -2
- package/dist/elements/services/placementService/DefaultPlacementService.js.map +1 -1
- package/dist/elements/widgets/designerView/DomConverter.d.ts +1 -1
- package/dist/elements/widgets/designerView/designerCanvas.js +17 -16
- package/dist/elements/widgets/designerView/designerCanvas.js.map +1 -1
- package/dist/elements/widgets/designerView/designerView.d.ts +2 -2
- package/dist/elements/widgets/designerView/designerView.js +2 -2
- package/dist/elements/widgets/designerView/designerView.js.map +1 -1
- package/dist/elements/widgets/designerView/extensions/CanvasExtension.d.ts +10 -0
- package/dist/elements/widgets/designerView/extensions/CanvasExtension.js +31 -0
- package/dist/elements/widgets/designerView/extensions/CanvasExtensionProvider.d.ts +10 -0
- package/dist/elements/widgets/designerView/extensions/CanvasExtensionProvider.js +16 -0
- package/dist/elements/widgets/designerView/extensions/MarginExtension copy.d.ts +10 -0
- package/dist/elements/widgets/designerView/extensions/MarginExtension copy.js +32 -0
- package/dist/elements/widgets/designerView/extensions/MarginExtensionProvider copy.d.ts +10 -0
- package/dist/elements/widgets/designerView/extensions/MarginExtensionProvider copy.js +16 -0
- package/dist/elements/widgets/designerView/extensions/RotateExtension.js +2 -1
- package/dist/elements/widgets/designerView/extensions/RotateExtension.js.map +1 -1
- package/dist/elements/widgets/designerView/extensions/buttons/AbstractDesignViewConfigButton copy.d.ts +12 -0
- package/dist/elements/widgets/designerView/extensions/buttons/AbstractDesignViewConfigButton copy.js +46 -0
- package/dist/elements/widgets/designerView/extensions/buttons/GridExtensionDesignViewConfigButtons copy.d.ts +4 -0
- package/dist/elements/widgets/designerView/extensions/buttons/GridExtensionDesignViewConfigButtons copy.js +7 -0
- package/dist/elements/widgets/designerView/extensions/buttons/OptionsConfigButton.d.ts +12 -0
- package/dist/elements/widgets/designerView/extensions/buttons/OptionsConfigButton.js +46 -0
- package/dist/elements/widgets/designerView/tools/DrawEllipsisTool.js +2 -1
- package/dist/elements/widgets/designerView/tools/DrawEllipsisTool.js.map +1 -1
- package/dist/elements/widgets/designerView/tools/DrawRectTool.js +2 -1
- package/dist/elements/widgets/designerView/tools/DrawRectTool.js.map +1 -1
- package/dist/elements/widgets/designerView/tools/MagicWandSelectorTool.js +3 -2
- package/dist/elements/widgets/designerView/tools/MagicWandSelectorTool.js.map +1 -1
- package/dist/elements/widgets/designerView/tools/PointerTool.js +10 -9
- package/dist/elements/widgets/designerView/tools/PointerTool.js.map +1 -1
- package/dist/elements/widgets/designerView/tools/RectangleSelectorTool.js +3 -2
- package/dist/elements/widgets/designerView/tools/RectangleSelectorTool.js.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/dist/elements/widgets/designerView/tools/MarginTool copy.d.ts +0 -10
- package/dist/elements/widgets/designerView/tools/MarginTool copy.js +0 -35
- package/dist/elements/widgets/designerView/tools/MarginTool copy.js.map +0 -1
|
@@ -0,0 +1,155 @@
|
|
|
1
|
+
import { DomConverter } from '../../widgets/designerView/DomConverter.js';
|
|
2
|
+
import { combineTransforms, extractTranslationFromDOMMatrix, getResultingTransformationBetweenElementAndAllAncestors } from '../../helper/TransformHelper.js';
|
|
3
|
+
import { filterChildPlaceItems, getDesignItemCurrentPos, placeDesignItem } from '../../helper/LayoutHelper.js';
|
|
4
|
+
import { ExtensionType } from '../../widgets/designerView/extensions/ExtensionType.js';
|
|
5
|
+
import { straightenLine } from '../../helper/PathDataPolyfill.js';
|
|
6
|
+
export class AbsolutePlacementService {
|
|
7
|
+
serviceForContainer(container, containerStyle, mode, item, event) {
|
|
8
|
+
if (item != null && (item.getComputedStyle()?.position == 'absolute' || item.getComputedStyle()?.position == 'relative'))
|
|
9
|
+
return true;
|
|
10
|
+
/*if (containerStyle.display === 'grid' || containerStyle.display === 'inline-grid' ||
|
|
11
|
+
containerStyle.display === 'flex' || containerStyle.display === 'inline-flex')
|
|
12
|
+
return false;*/
|
|
13
|
+
return mode == 'drop' && event.ctrlKey;
|
|
14
|
+
}
|
|
15
|
+
isEnterableContainer(container) {
|
|
16
|
+
if (DomConverter.IsSelfClosingElement(container.element.localName))
|
|
17
|
+
return false;
|
|
18
|
+
if (!container.isRootItem && container.element.shadowRoot && container.element.shadowRoot.querySelector('slot') == null)
|
|
19
|
+
return false;
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
canEnter(container, items) {
|
|
23
|
+
if (!this.isEnterableContainer(container))
|
|
24
|
+
return false;
|
|
25
|
+
if (!items.every(x => !x.element.contains(container.element) && x !== container))
|
|
26
|
+
return false;
|
|
27
|
+
return true;
|
|
28
|
+
}
|
|
29
|
+
canLeave(container, items) {
|
|
30
|
+
return true;
|
|
31
|
+
}
|
|
32
|
+
getElementOffset(container, designItem) {
|
|
33
|
+
return container.instanceServiceContainer.designerCanvas.getNormalizedElementCoordinates(container.element);
|
|
34
|
+
}
|
|
35
|
+
calculateTrack(event, designerCanvas, startPoint, offsetInControl, newPoint, item) {
|
|
36
|
+
let trackX = newPoint.x - startPoint.x;
|
|
37
|
+
let trackY = newPoint.y - startPoint.y;
|
|
38
|
+
if (!event.ctrlKey) {
|
|
39
|
+
if (designerCanvas.alignOnGrid) {
|
|
40
|
+
let p = getDesignItemCurrentPos(item, 'position');
|
|
41
|
+
p.x = p.x % designerCanvas.gridSize;
|
|
42
|
+
p.y = p.y % designerCanvas.gridSize;
|
|
43
|
+
trackX = Math.round(trackX / designerCanvas.gridSize) * designerCanvas.gridSize - p.x;
|
|
44
|
+
trackY = Math.round(trackY / designerCanvas.gridSize) * designerCanvas.gridSize - p.y;
|
|
45
|
+
}
|
|
46
|
+
else if (designerCanvas.alignOnSnap) {
|
|
47
|
+
let rect = item.element.getBoundingClientRect();
|
|
48
|
+
let newPos = designerCanvas.snapLines.snapToPosition({ x: (newPoint.x - offsetInControl.x), y: (newPoint.y - offsetInControl.y) }, { width: rect.width / designerCanvas.scaleFactor, height: rect.height / designerCanvas.scaleFactor }, { x: trackX > 0 ? 1 : -1, y: trackY > 0 ? 1 : -1 });
|
|
49
|
+
if (newPos.x !== null) {
|
|
50
|
+
trackX = newPos.x - Math.round(startPoint.x) + Math.round(offsetInControl.x);
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
trackX = Math.round(trackX);
|
|
54
|
+
}
|
|
55
|
+
if (newPos.y !== null) {
|
|
56
|
+
trackY = newPos.y - Math.round(startPoint.y) + Math.round(offsetInControl.y);
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
trackY = Math.round(trackY);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return { x: trackX, y: trackY };
|
|
64
|
+
}
|
|
65
|
+
placePoint(event, designerCanvas, container, startPoint, offsetInControl, newPoint, items) {
|
|
66
|
+
let trackX = newPoint.x;
|
|
67
|
+
let trackY = newPoint.y;
|
|
68
|
+
if (!event.ctrlKey) {
|
|
69
|
+
if (designerCanvas.alignOnGrid) {
|
|
70
|
+
trackX = Math.round(trackX / designerCanvas.gridSize) * designerCanvas.gridSize;
|
|
71
|
+
trackY = Math.round(trackY / designerCanvas.gridSize) * designerCanvas.gridSize;
|
|
72
|
+
}
|
|
73
|
+
else if (designerCanvas.alignOnSnap) {
|
|
74
|
+
let newPos = designerCanvas.snapLines.snapToPosition({ x: newPoint.x - offsetInControl.x, y: newPoint.y - offsetInControl.y }, null, { x: trackX > 0 ? 1 : -1, y: trackY > 0 ? 1 : -1 });
|
|
75
|
+
if (newPos.x !== null) {
|
|
76
|
+
trackX = newPos.x;
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
trackX = Math.round(trackX);
|
|
80
|
+
}
|
|
81
|
+
if (newPos.y !== null) {
|
|
82
|
+
trackY = newPos.y;
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
trackY = Math.round(trackY);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
return { x: trackX, y: trackY };
|
|
90
|
+
}
|
|
91
|
+
startPlace(event, designerCanvas, container, startPoint, offsetInControl, newPoint, items) {
|
|
92
|
+
}
|
|
93
|
+
place(event, designerCanvas, container, startPoint, offsetInControl, newPoint, items) {
|
|
94
|
+
//TODO: this should revert all undo actions while active
|
|
95
|
+
//maybe a undo actions returns itself or an id so it could be changed?
|
|
96
|
+
let track = this.calculateTrack(event, designerCanvas, startPoint, offsetInControl, newPoint, items[0]);
|
|
97
|
+
if (event.shiftKey) {
|
|
98
|
+
track = straightenLine({ x: 0, y: 0 }, track, true);
|
|
99
|
+
}
|
|
100
|
+
let filteredItems = filterChildPlaceItems(items);
|
|
101
|
+
for (const designItem of filteredItems) {
|
|
102
|
+
const canvas = designItem.instanceServiceContainer.designerCanvas.rootDesignItem.element;
|
|
103
|
+
let originalElementAndAllAncestorsMultipliedMatrix = getResultingTransformationBetweenElementAndAllAncestors(designItem.parent.element, canvas, true);
|
|
104
|
+
let transformMatrixParentTransformsCompensated = null;
|
|
105
|
+
if (originalElementAndAllAncestorsMultipliedMatrix) {
|
|
106
|
+
transformMatrixParentTransformsCompensated = new DOMPoint(track.x, track.y, 0, 0).matrixTransform(originalElementAndAllAncestorsMultipliedMatrix.inverse());
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
transformMatrixParentTransformsCompensated = new DOMPoint(track.x, track.y, 0, 0);
|
|
110
|
+
}
|
|
111
|
+
const translationMatrix = new DOMMatrix().translate(transformMatrixParentTransformsCompensated.x, transformMatrixParentTransformsCompensated.y);
|
|
112
|
+
combineTransforms(designItem.element, designItem.getStyle('transform'), translationMatrix.toString());
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
moveElements(designItems, position, absolute) {
|
|
116
|
+
//TODO: Check if we set left or right
|
|
117
|
+
//TODO: Use CSS units
|
|
118
|
+
for (let d of designItems) {
|
|
119
|
+
if (position.x)
|
|
120
|
+
d.setStyle('left', parseInt(d.element.style.left) - position.x + 'px');
|
|
121
|
+
if (position.y)
|
|
122
|
+
d.setStyle('top', parseInt(d.element.style.top) - position.y + 'px');
|
|
123
|
+
}
|
|
124
|
+
designItems[0].instanceServiceContainer.designerCanvas.extensionManager.refreshExtensions(designItems);
|
|
125
|
+
}
|
|
126
|
+
enterContainer(container, items, mode) {
|
|
127
|
+
let filterdItems = filterChildPlaceItems(items);
|
|
128
|
+
for (let i of filterdItems) {
|
|
129
|
+
if (mode == 'drop')
|
|
130
|
+
i.setStyle('position', 'absolute');
|
|
131
|
+
container.insertChild(i);
|
|
132
|
+
if (i.lastContainerSize) {
|
|
133
|
+
if (!i.hasStyle('width'))
|
|
134
|
+
i.setStyle('width', i.lastContainerSize.width + 'px');
|
|
135
|
+
if (!i.hasStyle('height'))
|
|
136
|
+
i.setStyle('height', i.lastContainerSize.height + 'px');
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
leaveContainer(container, items) {
|
|
141
|
+
}
|
|
142
|
+
finishPlace(event, designerCanvas, container, startPoint, offsetInControl, newPoint, items) {
|
|
143
|
+
let filterdItems = filterChildPlaceItems(items);
|
|
144
|
+
for (const designItem of filterdItems) {
|
|
145
|
+
let translation = extractTranslationFromDOMMatrix(new DOMMatrix(designItem.element.style.transform));
|
|
146
|
+
const stylesMapOffset = extractTranslationFromDOMMatrix(new DOMMatrix(designItem.getStyle('transform') ?? ''));
|
|
147
|
+
designItem.element.style.transform = designItem.getStyle('transform') ?? '';
|
|
148
|
+
let track = { x: translation.x, y: translation.y };
|
|
149
|
+
placeDesignItem(container, designItem, { x: track.x - stylesMapOffset.x, y: track.y - stylesMapOffset.y }, 'position');
|
|
150
|
+
}
|
|
151
|
+
for (const item of items) {
|
|
152
|
+
designerCanvas.extensionManager.removeExtension(item, ExtensionType.Placement);
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|
|
@@ -3,6 +3,7 @@ import { combineTransforms, extractTranslationFromDOMMatrix } from '../../helper
|
|
|
3
3
|
import { filterChildPlaceItems, getDesignItemCurrentPos, placeDesignItem } from '../../helper/LayoutHelper.js';
|
|
4
4
|
import { ExtensionType } from '../../widgets/designerView/extensions/ExtensionType.js';
|
|
5
5
|
import { straightenLine } from '../../helper/PathDataPolyfill.js';
|
|
6
|
+
import { hasCommandKey } from '../../helper/KeyboardHelper.js';
|
|
6
7
|
export class AbsolutePlacementService {
|
|
7
8
|
serviceForContainer(container, containerStyle, item) {
|
|
8
9
|
if (item != null && item.getComputedStyle()?.position == 'absolute')
|
|
@@ -35,7 +36,7 @@ export class AbsolutePlacementService {
|
|
|
35
36
|
calculateTrack(event, designerCanvas, startPoint, offsetInControl, newPoint, item) {
|
|
36
37
|
let trackX = newPoint.x - startPoint.x;
|
|
37
38
|
let trackY = newPoint.y - startPoint.y;
|
|
38
|
-
if (!event
|
|
39
|
+
if (!hasCommandKey(event)) {
|
|
39
40
|
if (designerCanvas.alignOnGrid) {
|
|
40
41
|
let p = getDesignItemCurrentPos(item, 'position');
|
|
41
42
|
p.x = p.x % designerCanvas.gridSize;
|
|
@@ -65,7 +66,7 @@ export class AbsolutePlacementService {
|
|
|
65
66
|
placePoint(event, designerCanvas, container, startPoint, offsetInControl, newPoint, items) {
|
|
66
67
|
let trackX = newPoint.x;
|
|
67
68
|
let trackY = newPoint.y;
|
|
68
|
-
if (!event
|
|
69
|
+
if (!hasCommandKey(event)) {
|
|
69
70
|
if (designerCanvas.alignOnGrid) {
|
|
70
71
|
trackX = Math.round(trackX / designerCanvas.gridSize) * designerCanvas.gridSize;
|
|
71
72
|
trackY = Math.round(trackY / designerCanvas.gridSize) * designerCanvas.gridSize;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbsolutePlacementService.js","sourceRoot":"","sources":["../../../../src/elements/services/placementService/AbsolutePlacementService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,+BAA+B,EAAE,MAAM,iCAAiC,CAAC;AACrG,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/G,OAAO,EAAE,aAAa,EAAE,MAAM,wDAAwD,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"AbsolutePlacementService.js","sourceRoot":"","sources":["../../../../src/elements/services/placementService/AbsolutePlacementService.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,+BAA+B,EAAE,MAAM,iCAAiC,CAAC;AACrG,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/G,OAAO,EAAE,aAAa,EAAE,MAAM,wDAAwD,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAElE,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAE/D,MAAM,OAAO,wBAAwB;IAEnC,mBAAmB,CAAC,SAAsB,EAAE,cAAmC,EAAE,IAAkB;QACjG,IAAI,IAAI,IAAI,IAAI,IAAI,IAAI,CAAC,gBAAgB,EAAE,EAAE,QAAQ,IAAI,UAAU;YACjE,OAAO,IAAI,CAAC;QACd,IAAI,cAAc,CAAC,OAAO,KAAK,MAAM,IAAI,cAAc,CAAC,OAAO,KAAK,aAAa;YAC/E,cAAc,CAAC,OAAO,KAAK,MAAM,IAAI,cAAc,CAAC,OAAO,KAAK,aAAa;YAC7E,OAAO,KAAK,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,oBAAoB,CAAC,SAAsB;QACzC,IAAI,YAAY,CAAC,oBAAoB,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC;YAChE,OAAO,KAAK,CAAC;QACf,IAAI,CAAC,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,OAAO,CAAC,UAAU,IAAI,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,IAAI;YACrH,OAAO,KAAK,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ,CAAC,SAAsB,EAAE,KAAoB;QACnD,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC;YACvC,OAAO,KAAK,CAAC;QACf,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;YAC9E,OAAO,KAAK,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,QAAQ,CAAC,SAAsB,EAAE,KAAoB;QACnD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,gBAAgB,CAAC,SAAsB,EAAE,UAAwB;QAC/D,OAAO,SAAS,CAAC,wBAAwB,CAAC,cAAc,CAAC,+BAA+B,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC9G,CAAC;IAEO,cAAc,CAAC,KAAiB,EAAE,cAA+B,EAAE,UAAkB,EAAE,eAAuB,EAAE,QAAgB,EAAE,IAAiB;QACzJ,IAAI,MAAM,GAAG,QAAQ,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;QACvC,IAAI,MAAM,GAAG,QAAQ,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;QAEvC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,IAAI,cAAc,CAAC,WAAW,EAAE,CAAC;gBAC/B,IAAI,CAAC,GAAG,uBAAuB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;gBAClD,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC;gBACpC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC;gBACpC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC;gBACtF,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC;YACxF,CAAC;iBACI,IAAI,cAAc,CAAC,WAAW,EAAE,CAAC;gBACpC,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;gBAChD,IAAI,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,GAAG,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,WAAW,EAAE,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;gBAC5R,IAAI,MAAM,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;oBACtB,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC/E,CAAC;qBAAM,CAAC;oBACN,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC9B,CAAC;gBACD,IAAI,MAAM,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;oBACtB,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;gBAC/E,CAAC;qBAAM,CAAC;oBACN,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,CAAC;IAED,UAAU,CAAC,KAAiB,EAAE,cAA+B,EAAE,SAAsB,EAAE,UAAkB,EAAE,eAAuB,EAAE,QAAgB,EAAE,KAAoB;QACxK,IAAI,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;QACxB,IAAI,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;QAExB,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,IAAI,cAAc,CAAC,WAAW,EAAE,CAAC;gBAC/B,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC;gBAChF,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,cAAc,CAAC,QAAQ,CAAC;YAClF,CAAC;iBACI,IAAI,cAAc,CAAC,WAAW,EAAE,CAAC;gBACpC,IAAI,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;gBACxL,IAAI,MAAM,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;oBACtB,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;gBACpB,CAAC;qBAAM,CAAC;oBACN,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC9B,CAAC;gBACD,IAAI,MAAM,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;oBACtB,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;gBACpB,CAAC;qBAAM,CAAC;oBACN,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,CAAC;IAED,UAAU,CAAC,KAAiB,EAAE,cAA+B,EAAE,SAAsB,EAAE,UAAkB,EAAE,eAAuB,EAAE,QAAgB,EAAE,KAAoB;IAC1K,CAAC;IAED,KAAK,CAAC,KAAiB,EAAE,cAA+B,EAAE,SAAsB,EAAE,UAAkB,EAAE,eAAuB,EAAE,QAAgB,EAAE,KAAoB;QACnK,wDAAwD;QACxD,sEAAsE;QACtE,IAAI,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAExG,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,KAAK,GAAG,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,aAAa,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACjD,KAAK,MAAM,UAAU,IAAI,aAAa,EAAE,CAAC;YACvC,MAAM,MAAM,GAAG,UAAU,CAAC,wBAAwB,CAAC,cAAc,CAAC,cAAc,CAAC,OAAO,CAAC;YACzF,MAAM,gBAAgB,GAAa,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAe,MAAM,CAAC,CAAC;YAC7I,MAAM,iBAAiB,GAAG,IAAI,SAAS,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;YAC5F,iBAAiB,CAAe,UAAU,CAAC,OAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvH,CAAC;IACH,CAAC;IAED,YAAY,CAAC,WAA0B,EAAE,QAAgB,EAAE,QAAiB;QAC1E,qCAAqC;QACrC,qBAAqB;QAErB,KAAK,IAAI,CAAC,IAAI,WAAW,EAAE,CAAC;YAC1B,IAAI,QAAQ,CAAC,CAAC;gBACZ,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAe,CAAC,CAAC,OAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YACxF,IAAI,QAAQ,CAAC,CAAC;gBACZ,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAe,CAAC,CAAC,OAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;QACxF,CAAC;QACD,WAAW,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,cAAc,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACzG,CAAC;IAED,cAAc,CAAC,SAAsB,EAAE,KAAoB,EAAE,IAAuB;QAClF,IAAI,YAAY,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAChD,KAAK,IAAI,CAAC,IAAI,YAAY,EAAE,CAAC;YAC3B,IAAI,IAAI,IAAI,MAAM;gBAChB,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YACrC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;YAEzB,IAAI,CAAC,CAAC,iBAAiB,EAAE,CAAC;gBACxB,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;oBACtB,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,iBAAiB,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;gBACxD,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBACvB,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,iBAAiB,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC;IACH,CAAC;IAED,cAAc,CAAC,SAAsB,EAAE,KAAoB;IAC3D,CAAC;IAED,WAAW,CAAC,KAAiB,EAAE,cAA+B,EAAE,SAAsB,EAAE,UAAkB,EAAE,eAAuB,EAAE,QAAgB,EAAE,KAAoB;QACzK,IAAI,YAAY,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAChD,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE,CAAC;YACtC,IAAI,WAAW,GAAa,+BAA+B,CAAC,IAAI,SAAS,CAAe,UAAU,CAAC,OAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;YAC9H,MAAM,eAAe,GAAa,+BAA+B,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAC3G,UAAU,CAAC,OAAQ,CAAC,KAAK,CAAC,SAAS,GAAG,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YAC3F,IAAI,KAAK,GAAG,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;YACnD,eAAe,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QACzH,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACR,cAAe,CAAC,gBAAgB,CAAC,eAAe,CAAC,IAAI,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;QACnG,CAAC;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { IDesignItem } from '../../item/IDesignItem.js';
|
|
2
|
+
import { AbsolutePlacementService } from './AbsolutePlacementService.js';
|
|
3
|
+
export declare class AlwaysAbsolutePlacementService extends AbsolutePlacementService {
|
|
4
|
+
serviceForContainer(container: IDesignItem, containerStyle: CSSStyleDeclaration, item?: IDesignItem): boolean;
|
|
5
|
+
}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { AbsolutePlacementService } from './AbsolutePlacementService.js';
|
|
2
|
+
export class AlwaysAbsolutePlacementService extends AbsolutePlacementService {
|
|
3
|
+
serviceForContainer(container, containerStyle, item) {
|
|
4
|
+
return true;
|
|
5
|
+
}
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=AlwaysAbsolutePlacementService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AlwaysAbsolutePlacementService.js","sourceRoot":"","sources":["../../../../src/elements/services/placementService/AlwaysAbsolutePlacementService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,MAAM,OAAO,8BAA+B,SAAQ,wBAAwB;IACjE,mBAAmB,CAAC,SAAsB,EAAE,cAAmC,EAAE,IAAkB;QAC1G,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -3,6 +3,7 @@ import { combineTransforms, extractTranslationFromDOMMatrix } from '../../helper
|
|
|
3
3
|
import { filterChildPlaceItems, getDesignItemCurrentPos, placeDesignItem } from '../../helper/LayoutHelper.js';
|
|
4
4
|
import { ExtensionType } from '../../widgets/designerView/extensions/ExtensionType.js';
|
|
5
5
|
import { straightenLine } from '../../helper/PathDataPolyfill.js';
|
|
6
|
+
import { hasCommandKey } from '../../helper/KeyboardHelper.js';
|
|
6
7
|
export class DefaultPlacementService {
|
|
7
8
|
serviceForContainer(container, containerStyle, item) {
|
|
8
9
|
if (item != null && item.getComputedStyle()?.position == 'absolute')
|
|
@@ -35,7 +36,7 @@ export class DefaultPlacementService {
|
|
|
35
36
|
calculateTrack(event, placementView, startPoint, offsetInControl, newPoint, item) {
|
|
36
37
|
let trackX = newPoint.x - startPoint.x;
|
|
37
38
|
let trackY = newPoint.y - startPoint.y;
|
|
38
|
-
if (!event
|
|
39
|
+
if (!hasCommandKey(event)) {
|
|
39
40
|
if (placementView.alignOnGrid) {
|
|
40
41
|
let p = getDesignItemCurrentPos(item, 'position');
|
|
41
42
|
p.x = p.x % placementView.gridSize;
|
|
@@ -65,7 +66,7 @@ export class DefaultPlacementService {
|
|
|
65
66
|
placePoint(event, placementView, container, startPoint, offsetInControl, newPoint, items) {
|
|
66
67
|
let trackX = newPoint.x;
|
|
67
68
|
let trackY = newPoint.y;
|
|
68
|
-
if (!event
|
|
69
|
+
if (!hasCommandKey(event)) {
|
|
69
70
|
if (placementView.alignOnGrid) {
|
|
70
71
|
trackX = Math.round(trackX / placementView.gridSize) * placementView.gridSize;
|
|
71
72
|
trackY = Math.round(trackY / placementView.gridSize) * placementView.gridSize;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DefaultPlacementService.js","sourceRoot":"","sources":["../../../../src/elements/services/placementService/DefaultPlacementService.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,4CAA4C,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,+BAA+B,EAAE,MAAM,iCAAiC,CAAC;AACrG,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/G,OAAO,EAAE,aAAa,EAAE,MAAM,wDAAwD,CAAC;AACvF,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"DefaultPlacementService.js","sourceRoot":"","sources":["../../../../src/elements/services/placementService/DefaultPlacementService.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,6 @@ import { IDesignItem } from "../../item/IDesignItem.js";
|
|
|
2
2
|
export declare class DomConverter {
|
|
3
3
|
static normalizeAttributeValue(value: string | number, useSingleQuotes?: boolean): string;
|
|
4
4
|
static normalizeContentValue(value: string): string;
|
|
5
|
-
static IsSelfClosingElement(tag: string): tag is "area" | "base" | "br" | "col" | "embed" | "hr" | "img" | "
|
|
5
|
+
static IsSelfClosingElement(tag: string): tag is "input" | "area" | "base" | "br" | "col" | "embed" | "hr" | "img" | "keygen" | "link" | "meta" | "param" | "source" | "track" | "wbr";
|
|
6
6
|
static ConvertToString(designItems: IDesignItem[], beautifyOutput?: boolean, updatePositions?: boolean): string;
|
|
7
7
|
}
|
|
@@ -24,6 +24,7 @@ import { TouchGestureHelper } from '../../helper/TouchGestureHelper.js';
|
|
|
24
24
|
import { stylesheetFromString } from '../../helper/StylesheetHelper.js';
|
|
25
25
|
import { AbstractStylesheetService } from '../../services/stylesheetService/AbstractStylesheetService.js';
|
|
26
26
|
import { addPolyfill as addBoxQuadsPolyfill } from '../../helper/getBoxQuads.js';
|
|
27
|
+
import { hasCommandKey } from '../../helper/KeyboardHelper.js';
|
|
27
28
|
const disableAnimationsSheet = cssFromString `
|
|
28
29
|
* {
|
|
29
30
|
animation-play-state: paused !important;
|
|
@@ -1015,21 +1016,21 @@ export class DesignerCanvas extends BaseCustomWebComponentLazyAppend {
|
|
|
1015
1016
|
if (event.defaultPrevented)
|
|
1016
1017
|
return;
|
|
1017
1018
|
}
|
|
1018
|
-
if ((event
|
|
1019
|
-
this.executeCommand({ type: CommandType.undo, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1020
|
-
else if ((event
|
|
1021
|
-
this.executeCommand({ type: CommandType.redo, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1022
|
-
else if ((event
|
|
1023
|
-
this.executeCommand({ type: CommandType.redo, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1024
|
-
else if ((event
|
|
1025
|
-
this.executeCommand({ type: CommandType.selectAll, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1026
|
-
else if ((event
|
|
1027
|
-
this.executeCommand({ type: CommandType.copy, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1028
|
-
else if ((event
|
|
1029
|
-
this.executeCommand({ type: CommandType.paste, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1030
|
-
else if ((event
|
|
1031
|
-
this.executeCommand({ type: CommandType.cut, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1032
|
-
else if ((event
|
|
1019
|
+
if (hasCommandKey(event) && event.key === 'z' && !event.shiftKey)
|
|
1020
|
+
this.executeCommand({ type: CommandType.undo, metaKey: event.metaKey, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1021
|
+
else if (hasCommandKey(event) && event.key === 'z' && event.shiftKey)
|
|
1022
|
+
this.executeCommand({ type: CommandType.redo, metaKey: event.metaKey, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1023
|
+
else if (hasCommandKey(event) && event.key === 'y')
|
|
1024
|
+
this.executeCommand({ type: CommandType.redo, metaKey: event.metaKey, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1025
|
+
else if (hasCommandKey(event) && event.key === 'a')
|
|
1026
|
+
this.executeCommand({ type: CommandType.selectAll, metaKey: event.metaKey, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1027
|
+
else if (hasCommandKey(event) && event.key === 'c')
|
|
1028
|
+
this.executeCommand({ type: CommandType.copy, metaKey: event.metaKey, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1029
|
+
else if (hasCommandKey(event) && event.key === 'v')
|
|
1030
|
+
this.executeCommand({ type: CommandType.paste, metaKey: event.metaKey, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1031
|
+
else if (hasCommandKey(event) && event.key === 'x')
|
|
1032
|
+
this.executeCommand({ type: CommandType.cut, metaKey: event.metaKey, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1033
|
+
else if (hasCommandKey(event) && event.key === 'f')
|
|
1033
1034
|
this._searchShowOverlay();
|
|
1034
1035
|
else {
|
|
1035
1036
|
let primarySelection = this.instanceServiceContainer.selectionService.primarySelection;
|
|
@@ -1042,7 +1043,7 @@ export class DesignerCanvas extends BaseCustomWebComponentLazyAppend {
|
|
|
1042
1043
|
switch (event.key) {
|
|
1043
1044
|
case 'Delete':
|
|
1044
1045
|
case 'Backspace':
|
|
1045
|
-
this.executeCommand({ type: CommandType.delete, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1046
|
+
this.executeCommand({ type: CommandType.delete, metaKey: event.metaKey, ctrlKey: event.ctrlKey, altKey: event.altKey, shiftKey: event.shiftKey });
|
|
1046
1047
|
break;
|
|
1047
1048
|
case 'ArrowDown':
|
|
1048
1049
|
case 'ArrowUp':
|