@node-projects/web-component-designer 0.0.57 → 0.0.61

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.
Files changed (67) hide show
  1. package/.github/FUNDING.yml +3 -0
  2. package/dist/commandHandling/CommandType.d.ts +3 -0
  3. package/dist/commandHandling/CommandType.js +3 -0
  4. package/dist/elements/documentContainer.d.ts +5 -0
  5. package/dist/elements/documentContainer.js +50 -11
  6. package/dist/elements/helper/CssAttributeParser.d.ts +1 -1
  7. package/dist/elements/helper/CssAttributeParser.js +6 -3
  8. package/dist/elements/helper/CssCombiner.js +1 -1
  9. package/dist/elements/helper/GridHelper.js +7 -3
  10. package/dist/elements/services/DefaultServiceBootstrap.js +5 -0
  11. package/dist/elements/services/GlobalContext.d.ts +4 -0
  12. package/dist/elements/services/GlobalContext.js +12 -0
  13. package/dist/elements/services/ServiceContainer.d.ts +5 -0
  14. package/dist/elements/services/ServiceContainer.js +4 -0
  15. package/dist/elements/services/demoProviderService/DemoProviderService.d.ts +6 -0
  16. package/dist/elements/services/demoProviderService/DemoProviderService.js +28 -0
  17. package/dist/elements/services/demoProviderService/IDemoProviderService.d.ts +5 -0
  18. package/dist/elements/services/demoProviderService/IDemoProviderService.js +1 -0
  19. package/dist/elements/services/placementService/GridPlacementService.js +25 -5
  20. package/dist/elements/widgets/codeView/ICodeView.d.ts +2 -0
  21. package/dist/elements/widgets/codeView/code-view-ace.d.ts +2 -1
  22. package/dist/elements/widgets/codeView/code-view-ace.js +3 -1
  23. package/dist/elements/widgets/codeView/code-view-code-mirror.d.ts +2 -1
  24. package/dist/elements/widgets/codeView/code-view-code-mirror.js +3 -1
  25. package/dist/elements/widgets/codeView/code-view-monaco.d.ts +2 -1
  26. package/dist/elements/widgets/codeView/code-view-monaco.js +11 -1
  27. package/dist/elements/widgets/demoView/demoView.d.ts +1 -1
  28. package/dist/elements/widgets/demoView/demoView.js +3 -22
  29. package/dist/elements/widgets/designerView/ButtonSeperatorProvider copy.d.ts +7 -0
  30. package/dist/elements/widgets/designerView/ButtonSeperatorProvider copy.js +11 -0
  31. package/dist/elements/widgets/designerView/ButtonSeperatorProvider.d.ts +8 -0
  32. package/dist/elements/widgets/designerView/ButtonSeperatorProvider.js +11 -0
  33. package/dist/elements/widgets/designerView/DesignContext.d.ts +3 -0
  34. package/dist/elements/widgets/designerView/DesignContext.js +1 -0
  35. package/dist/elements/widgets/designerView/DesignerViewUseOverlayScollbars.d.ts +7 -0
  36. package/dist/elements/widgets/designerView/DesignerViewUseOverlayScollbars.js +13 -0
  37. package/dist/elements/widgets/designerView/IDesignContext.d.ts +3 -0
  38. package/dist/elements/widgets/designerView/IDesignViewConfigButtonsProvider.d.ts +5 -0
  39. package/dist/elements/widgets/designerView/IDesignViewConfigButtonsProvider.js +1 -0
  40. package/dist/elements/widgets/designerView/designerCanvas.d.ts +0 -1
  41. package/dist/elements/widgets/designerView/designerCanvas.js +25 -12
  42. package/dist/elements/widgets/designerView/designerView.d.ts +1 -0
  43. package/dist/elements/widgets/designerView/designerView.js +14 -0
  44. package/dist/elements/widgets/designerView/extensions/GridExtensionConfigButtons.d.ts +5 -0
  45. package/dist/elements/widgets/designerView/extensions/GridExtensionConfigButtons.js +12 -0
  46. package/dist/elements/widgets/designerView/extensions/GridExtensionDesignViewConfigButtons.d.ts +6 -0
  47. package/dist/elements/widgets/designerView/extensions/GridExtensionDesignViewConfigButtons.js +21 -0
  48. package/dist/elements/widgets/designerView/extensions/GridExtensionProvider copy.d.ts +10 -0
  49. package/dist/elements/widgets/designerView/extensions/GridExtensionProvider copy.js +18 -0
  50. package/dist/elements/widgets/designerView/extensions/GridExtensionProvider.d.ts +1 -0
  51. package/dist/elements/widgets/designerView/extensions/GridExtensionProvider.js +2 -1
  52. package/dist/elements/widgets/designerView/extensions/GridExtensionProviderConfigButtons.d.ts +5 -0
  53. package/dist/elements/widgets/designerView/extensions/GridExtensionProviderConfigButtons.js +12 -0
  54. package/dist/elements/widgets/designerView/extensions/GridExtensionProviderOptions.d.ts +10 -0
  55. package/dist/elements/widgets/designerView/extensions/GridExtensionProviderOptions.js +18 -0
  56. package/dist/elements/widgets/designerView/extensions/IDesignViewConfigButtonsProvider.d.ts +0 -0
  57. package/dist/elements/widgets/designerView/extensions/IDesignViewConfigButtonsProvider.js +1 -0
  58. package/dist/elements/widgets/designerView/extensions/IExtensionConfiguration.d.ts +3 -0
  59. package/dist/elements/widgets/designerView/extensions/IExtensionConfiguration.js +1 -0
  60. package/dist/elements/widgets/designerView/extensions/ResizeExtension.js +4 -1
  61. package/dist/elements/widgets/designerView/tools/DrawPathTool.d.ts +9 -0
  62. package/dist/elements/widgets/designerView/tools/DrawPathTool.js +95 -29
  63. package/dist/elements/widgets/designerView/tools/PointerTool.js +2 -2
  64. package/dist/elements/widgets/propertyGrid/PropertyGridWithHeader.js +3 -0
  65. package/dist/index.d.ts +2 -0
  66. package/dist/index.js +1 -0
  67. package/package.json +4 -4
@@ -0,0 +1,3 @@
1
+ # These are supported funding model platforms
2
+
3
+ github: jogibear9988
@@ -21,5 +21,8 @@ export declare enum CommandType {
21
21
  'distributeHorizontal' = "distributeHorizontaly",
22
22
  'distributeVertical' = "distributeVertical",
23
23
  'setTool' = "setTool",
24
+ 'setStrokeColor' = "setStrokeColor",
25
+ 'setFillBrush' = "setFillBrush",
26
+ 'setStrokeThickness' = "setStrokeThickness",
24
27
  'screenshot' = "screenshot"
25
28
  }
@@ -22,5 +22,8 @@ export var CommandType;
22
22
  CommandType["distributeHorizontal"] = "distributeHorizontaly";
23
23
  CommandType["distributeVertical"] = "distributeVertical";
24
24
  CommandType["setTool"] = "setTool";
25
+ CommandType["setStrokeColor"] = "setStrokeColor";
26
+ CommandType["setFillBrush"] = "setFillBrush";
27
+ CommandType["setStrokeThickness"] = "setStrokeThickness";
25
28
  CommandType["screenshot"] = "screenshot";
26
29
  })(CommandType || (CommandType = {}));
@@ -16,8 +16,13 @@ export declare class DocumentContainer extends BaseCustomWebComponentLazyAppend
16
16
  private _content;
17
17
  private _tabControl;
18
18
  private _selectionPosition;
19
+ private _splitDiv;
20
+ private _designerDiv;
21
+ private _codeDiv;
22
+ private refreshInSplitViewDebounced;
19
23
  static get style(): CSSStyleSheet;
20
24
  constructor(serviceContainer: ServiceContainer, content?: string);
25
+ refreshInSplitView(): void;
21
26
  dispose(): void;
22
27
  executeCommand(command: IUiCommand): void;
23
28
  canExecuteCommand(command: IUiCommand): boolean;
@@ -1,4 +1,4 @@
1
- import { BaseCustomWebComponentLazyAppend, css } from "@node-projects/base-custom-webcomponent";
1
+ import { BaseCustomWebComponentLazyAppend, css, debounce } from "@node-projects/base-custom-webcomponent";
2
2
  import { DesignerTabControl } from "./controls/DesignerTabControl";
3
3
  import { DesignerView } from "./widgets/designerView/designerView";
4
4
  export class DocumentContainer extends BaseCustomWebComponentLazyAppend {
@@ -10,6 +10,10 @@ export class DocumentContainer extends BaseCustomWebComponentLazyAppend {
10
10
  _content = '';
11
11
  _tabControl;
12
12
  _selectionPosition;
13
+ _splitDiv;
14
+ _designerDiv;
15
+ _codeDiv;
16
+ refreshInSplitViewDebounced;
13
17
  static get style() {
14
18
  return css `
15
19
  div {
@@ -20,10 +24,16 @@ export class DocumentContainer extends BaseCustomWebComponentLazyAppend {
20
24
  node-projects-designer-view {
21
25
  height: 100%;
22
26
  /*overflow: auto;*/
23
- }`;
27
+ }
28
+ .split-div {
29
+ display: grid;
30
+ grid-template-rows: 1fr 1fr;
31
+ }
32
+ `;
24
33
  }
25
34
  constructor(serviceContainer, content) {
26
35
  super();
36
+ this.refreshInSplitViewDebounced = debounce(this.refreshInSplitView, 200);
27
37
  this._serviceContainer = serviceContainer;
28
38
  if (content != null)
29
39
  this._content = content;
@@ -32,12 +42,26 @@ export class DocumentContainer extends BaseCustomWebComponentLazyAppend {
32
42
  div.appendChild(this._tabControl);
33
43
  this.designerView = new DesignerView();
34
44
  this.designerView.setAttribute('exportparts', 'canvas');
35
- this.designerView.title = 'Designer';
36
- this._tabControl.appendChild(this.designerView);
45
+ this._designerDiv = document.createElement("div");
46
+ this._designerDiv.title = 'Designer';
47
+ this._designerDiv.appendChild(this.designerView);
48
+ this._tabControl.appendChild(this._designerDiv);
37
49
  this.designerView.initialize(this._serviceContainer);
38
50
  this.codeView = new serviceContainer.config.codeViewWidget();
39
- this.codeView.title = 'Code';
40
- this._tabControl.appendChild(this.codeView);
51
+ this._codeDiv = document.createElement("div");
52
+ this._codeDiv.title = 'Code';
53
+ this._codeDiv.appendChild(this.codeView);
54
+ this.codeView.onTextChanged.on(text => {
55
+ if (this._tabControl.selectedIndex === 2) {
56
+ this._content = text;
57
+ this.refreshInSplitViewDebounced();
58
+ }
59
+ });
60
+ this._tabControl.appendChild(this._codeDiv);
61
+ this._splitDiv = document.createElement("div");
62
+ this._splitDiv.title = 'Split';
63
+ this._splitDiv.className = 'split-div';
64
+ this._tabControl.appendChild(this._splitDiv);
41
65
  this.demoView = new serviceContainer.config.demoViewWidget();
42
66
  this.demoView.title = 'Preview';
43
67
  this._tabControl.appendChild(this.demoView);
@@ -46,6 +70,9 @@ export class DocumentContainer extends BaseCustomWebComponentLazyAppend {
46
70
  this._tabControl.selectedIndex = 0;
47
71
  });
48
72
  }
73
+ refreshInSplitView() {
74
+ this.designerView.parseHTML(this._content);
75
+ }
49
76
  dispose() {
50
77
  this.codeView.dispose();
51
78
  }
@@ -69,7 +96,9 @@ export class DocumentContainer extends BaseCustomWebComponentLazyAppend {
69
96
  this.designerView.parseHTML(this._content);
70
97
  else if (this._tabControl.selectedIndex === 1)
71
98
  this.codeView.update(this._content);
72
- else if (this._tabControl.selectedIndex === 2)
99
+ else if (this._tabControl.selectedIndex === 2) {
100
+ }
101
+ else if (this._tabControl.selectedIndex === 3)
73
102
  this.demoView.display(this._serviceContainer, this.designerView.instanceServiceContainer, this._content);
74
103
  }
75
104
  }
@@ -91,11 +120,16 @@ export class DocumentContainer extends BaseCustomWebComponentLazyAppend {
91
120
  this._content = this.designerView.getHTML(designItemsAssignmentList);
92
121
  this._selectionPosition = designItemsAssignmentList.get(primarySelection);
93
122
  }
94
- else if (i.oldIndex === 1)
123
+ else if (i.oldIndex === 1) {
95
124
  this._content = this.codeView.getText();
96
- if (i.newIndex === 0)
125
+ }
126
+ else if (i.oldIndex === 2) {
127
+ this._designerDiv.appendChild(this.designerView);
128
+ this._codeDiv.appendChild(this.codeView);
129
+ }
130
+ if (i.newIndex === 0 || i.newIndex === 2)
97
131
  this.designerView.parseHTML(this._content);
98
- else if (i.newIndex === 1) {
132
+ if (i.newIndex === 1 || i.newIndex === 2) {
99
133
  this.codeView.update(this._content);
100
134
  if (this._selectionPosition) {
101
135
  this.codeView.setSelection(this._selectionPosition);
@@ -105,8 +139,13 @@ export class DocumentContainer extends BaseCustomWebComponentLazyAppend {
105
139
  this.codeView.focusEditor();
106
140
  }
107
141
  }
108
- else if (i.newIndex === 2)
142
+ if (i.newIndex === 2) {
143
+ this._splitDiv.appendChild(this.designerView);
144
+ this._splitDiv.appendChild(this.codeView);
145
+ }
146
+ if (i.newIndex === 3) {
109
147
  this.demoView.display(this._serviceContainer, this.designerView.instanceServiceContainer, this._content);
148
+ }
110
149
  });
111
150
  if (this._content)
112
151
  this.content = this._content;
@@ -5,5 +5,5 @@ export declare class CssEntry {
5
5
  }
6
6
  export declare class CssAttributeParser {
7
7
  entries: CssEntry[];
8
- parse(text: string): void;
8
+ parse(text: string, quoteType?: string): void;
9
9
  }
@@ -14,7 +14,7 @@ export class CssEntry {
14
14
  }
15
15
  export class CssAttributeParser {
16
16
  entries = [];
17
- parse(text) {
17
+ parse(text, quoteType = '\'') {
18
18
  this.entries = [];
19
19
  let name = '';
20
20
  let value = '';
@@ -38,7 +38,7 @@ export class CssAttributeParser {
38
38
  token = Token.Name;
39
39
  }
40
40
  else {
41
- if (c === '\'') {
41
+ if (c === quoteType) {
42
42
  token = Token.InQuote;
43
43
  }
44
44
  value += c;
@@ -51,10 +51,13 @@ export class CssAttributeParser {
51
51
  c = text[n];
52
52
  value += c;
53
53
  }
54
- if (c === '\'') {
54
+ else if (c === quoteType) {
55
55
  value += c;
56
56
  token = Token.Value;
57
57
  }
58
+ else {
59
+ value += c;
60
+ }
58
61
  }
59
62
  }
60
63
  if (name.trim() !== '') {
@@ -1,6 +1,6 @@
1
1
  export class CssCombiner {
2
2
  static _helperElement = document.createElement('div');
3
- //todo: inset,
3
+ //todo: inset, flex flow, place content...
4
4
  static combine(styles, globalStyles) {
5
5
  let e = CssCombiner._helperElement;
6
6
  e.setAttribute('style', '');
@@ -1,8 +1,12 @@
1
1
  export function CalculateGridInformation(designItem) {
2
+ //todo:
3
+ //same name should combine columns/rows
2
4
  let itemRect = designItem.element.getBoundingClientRect();
3
5
  const computedStyle = getComputedStyle(designItem.element);
4
6
  const rows = computedStyle.gridTemplateRows.split(' ');
5
7
  const columns = computedStyle.gridTemplateColumns.split(' ');
8
+ const paddingLeft = Number.parseFloat(computedStyle.paddingLeft);
9
+ const paddingTop = Number.parseFloat(computedStyle.paddingTop);
6
10
  let y = 0;
7
11
  let xGap = 0;
8
12
  let yGap = 0;
@@ -81,12 +85,12 @@ export function CalculateGridInformation(designItem) {
81
85
  for (let yIdx = 0; yIdx < columns.length; yIdx++) {
82
86
  const c = columns[yIdx];
83
87
  if (x > 0 && xGap) {
84
- retVal.gaps.push({ x: x + xOffset, y: y + yOffset, width: xGap, height: currY });
88
+ retVal.gaps.push({ x: x + xOffset + paddingLeft, y: y + yOffset + paddingTop, width: xGap, height: currY });
85
89
  x += xGap;
86
90
  }
87
91
  const currX = Number.parseFloat(c.replace('px', ''));
88
92
  if (y > 0 && yGap) {
89
- retVal.gaps.push({ x: x + xOffset, y: y + yOffset - yGap, width: currX, height: yGap });
93
+ retVal.gaps.push({ x: x + xOffset + paddingLeft, y: y + yOffset - yGap + paddingTop, width: currX, height: yGap });
90
94
  }
91
95
  let name = null;
92
96
  if (areas) {
@@ -95,7 +99,7 @@ export function CalculateGridInformation(designItem) {
95
99
  name = nm;
96
100
  }
97
101
  }
98
- const cell = { x: x + xOffset, y: y + yOffset, width: currX, height: currY, name: name };
102
+ const cell = { x: x + xOffset + paddingLeft, y: y + yOffset + paddingTop, width: currX, height: currY, name: name };
99
103
  cellList.push(cell);
100
104
  x += currX;
101
105
  cl++;
@@ -45,6 +45,9 @@ import { DragDropService } from './dragDropService/DragDropService';
45
45
  import { EditTextExtensionProvider } from '../widgets/designerView/extensions/EditText/EditTextExtensionProvider.js';
46
46
  import { CopyPasteService } from './copyPasteService/CopyPasteService';
47
47
  import { DefaultModelCommandService } from './modelCommandService/DefaultModelCommandService';
48
+ import { ButtonSeperatorProvider } from '../widgets/designerView/ButtonSeperatorProvider';
49
+ import { GridExtensionDesignViewConfigButtons } from '../widgets/designerView/extensions/GridExtensionDesignViewConfigButtons';
50
+ import { DemoProviderService } from './demoProviderService/DemoProviderService';
48
51
  export function createDefaultServiceContainer() {
49
52
  let serviceContainer = new ServiceContainer();
50
53
  serviceContainer.register("propertyService", new PolymerPropertiesService());
@@ -65,6 +68,7 @@ export function createDefaultServiceContainer() {
65
68
  serviceContainer.register("dragDropService", new DragDropService());
66
69
  serviceContainer.register("copyPasteService", new CopyPasteService());
67
70
  serviceContainer.register("modelCommandService", new DefaultModelCommandService());
71
+ serviceContainer.register("demoProviderService", new DemoProviderService());
68
72
  serviceContainer.designerExtensions.set(ExtensionType.Permanent, [
69
73
  new ResizeExtensionProvider(false),
70
74
  new InvisibleDivExtensionProvider()
@@ -106,6 +110,7 @@ export function createDefaultServiceContainer() {
106
110
  serviceContainer.designerTools.set(NamedTools.MagicWandSelector, new MagicWandSelectorTool());
107
111
  serviceContainer.designerTools.set(NamedTools.PickColor, new PickColorTool());
108
112
  serviceContainer.designerTools.set(NamedTools.Text, new TextTool());
113
+ serviceContainer.designViewConfigButtons.push(new ButtonSeperatorProvider(20), new GridExtensionDesignViewConfigButtons());
109
114
  serviceContainer.designerContextMenuExtensions = [
110
115
  new CopyPasteContextMenu(),
111
116
  new ZMoveContextMenu(),
@@ -5,6 +5,7 @@ export declare class GlobalContext {
5
5
  private _serviceContainer;
6
6
  private _tool;
7
7
  private _strokeColor;
8
+ private _strokeThickness;
8
9
  private _fillBrush;
9
10
  constructor(serviceContainer: ServiceContainer);
10
11
  set tool(tool: ITool);
@@ -14,6 +15,9 @@ export declare class GlobalContext {
14
15
  set strokeColor(strokeColor: string);
15
16
  get strokeColor(): string;
16
17
  readonly onStrokeColorChanged: TypedEvent<PropertyChangedArgs<string>>;
18
+ set strokeThickness(strokeThickness: string);
19
+ get strokeThickness(): string;
20
+ readonly onStrokeThicknessChanged: TypedEvent<PropertyChangedArgs<string>>;
17
21
  set fillBrush(fillBrush: string);
18
22
  get fillBrush(): string;
19
23
  readonly onFillBrushChanged: TypedEvent<PropertyChangedArgs<string>>;
@@ -5,6 +5,7 @@ export class GlobalContext {
5
5
  _serviceContainer;
6
6
  _tool;
7
7
  _strokeColor = 'black';
8
+ _strokeThickness = '3';
8
9
  _fillBrush = 'transparent';
9
10
  constructor(serviceContainer) {
10
11
  this._serviceContainer = serviceContainer;
@@ -36,6 +37,17 @@ export class GlobalContext {
36
37
  return this._strokeColor;
37
38
  }
38
39
  onStrokeColorChanged = new TypedEvent();
40
+ set strokeThickness(strokeThickness) {
41
+ if (this._strokeThickness !== strokeThickness) {
42
+ const oldStrokeThickness = this._strokeThickness;
43
+ this._strokeThickness = strokeThickness;
44
+ this.onStrokeThicknessChanged.emit(new PropertyChangedArgs(strokeThickness, oldStrokeThickness));
45
+ }
46
+ }
47
+ get strokeThickness() {
48
+ return this._strokeThickness;
49
+ }
50
+ onStrokeThicknessChanged = new TypedEvent();
39
51
  set fillBrush(fillBrush) {
40
52
  this._fillBrush = fillBrush;
41
53
  if (this._fillBrush !== fillBrush) {
@@ -23,6 +23,8 @@ import { IDragDropService } from './dragDropService/IDragDropService';
23
23
  import { ICopyPasteService } from "./copyPasteService/ICopyPasteService.js";
24
24
  import { IDesignerPointerExtensionProvider } from "../widgets/designerView/extensions/pointerExtensions/IDesignerPointerExtensionProvider.js";
25
25
  import { IModelCommandService } from "./modelCommandService/IModelCommandService.js";
26
+ import { IDesignViewConfigButtonsProvider } from "../widgets/designerView/IDesignViewConfigButtonsProvider.js";
27
+ import { IDemoProviderService } from "./demoProviderService/IDemoProviderService.js";
26
28
  interface ServiceNameMap {
27
29
  "propertyService": IPropertiesService;
28
30
  "containerService": IPlacementService;
@@ -39,6 +41,7 @@ interface ServiceNameMap {
39
41
  "dragDropService": IDragDropService;
40
42
  "copyPasteService": ICopyPasteService;
41
43
  "modelCommandService": IModelCommandService;
44
+ "demoProviderService": IDemoProviderService;
42
45
  }
43
46
  export declare class ServiceContainer extends BaseServiceContainer<ServiceNameMap> {
44
47
  readonly config: {
@@ -46,6 +49,7 @@ export declare class ServiceContainer extends BaseServiceContainer<ServiceNameMa
46
49
  demoViewWidget: new (...args: any[]) => IDemoView & HTMLElement;
47
50
  };
48
51
  readonly designerExtensions: Map<(ExtensionType | string), IDesignerExtensionProvider[]>;
52
+ readonly designViewConfigButtons: IDesignViewConfigButtonsProvider[];
49
53
  readonly designerPointerExtensions: IDesignerPointerExtensionProvider[];
50
54
  designerContextMenuExtensions: IContextMenuExtension[];
51
55
  readonly globalContext: GlobalContext;
@@ -65,5 +69,6 @@ export declare class ServiceContainer extends BaseServiceContainer<ServiceNameMa
65
69
  get dragDropService(): IDragDropService;
66
70
  get copyPasteService(): ICopyPasteService;
67
71
  get modelCommandService(): IModelCommandService;
72
+ get demoProviderService(): IDemoProviderService;
68
73
  }
69
74
  export {};
@@ -8,6 +8,7 @@ export class ServiceContainer extends BaseServiceContainer {
8
8
  demoViewWidget: DemoView
9
9
  };
10
10
  designerExtensions = new Map();
11
+ designViewConfigButtons = [];
11
12
  designerPointerExtensions = [];
12
13
  designerContextMenuExtensions;
13
14
  globalContext = new GlobalContext(this);
@@ -57,4 +58,7 @@ export class ServiceContainer extends BaseServiceContainer {
57
58
  get modelCommandService() {
58
59
  return this.getLastService('modelCommandService');
59
60
  }
61
+ get demoProviderService() {
62
+ return this.getLastService('demoProviderService');
63
+ }
60
64
  }
@@ -0,0 +1,6 @@
1
+ import { InstanceServiceContainer } from "../InstanceServiceContainer.js";
2
+ import { ServiceContainer } from "../ServiceContainer.js";
3
+ import { IDemoProviderService } from "./IDemoProviderService.js";
4
+ export declare class DemoProviderService implements IDemoProviderService {
5
+ provideDemo(container: HTMLElement, serviceContainer: ServiceContainer, instanceServiceContainer: InstanceServiceContainer, code: string): Promise<void>;
6
+ }
@@ -0,0 +1,28 @@
1
+ import { DomHelper } from '@node-projects/base-custom-webcomponent/dist/DomHelper';
2
+ export class DemoProviderService {
3
+ provideDemo(container, serviceContainer, instanceServiceContainer, code) {
4
+ return new Promise(resolve => {
5
+ const iframe = document.createElement('iframe');
6
+ iframe.style.width = '100%';
7
+ iframe.style.height = '100%';
8
+ iframe.style.border = 'none';
9
+ iframe.style.display = 'none';
10
+ DomHelper.removeAllChildnodes(container);
11
+ container.appendChild(iframe);
12
+ iframe.onload = () => {
13
+ iframe.style.display = 'block';
14
+ resolve();
15
+ };
16
+ const doc = iframe.contentWindow.document;
17
+ doc.open();
18
+ doc.write('<script type="module">');
19
+ for (let i of instanceServiceContainer.designContext.imports) {
20
+ doc.write("import '" + i + "';");
21
+ }
22
+ doc.write("document.body.style.display='';");
23
+ doc.write('</script>');
24
+ doc.write('<body style="display:none">' + code + '</body>');
25
+ doc.close();
26
+ });
27
+ }
28
+ }
@@ -0,0 +1,5 @@
1
+ import { InstanceServiceContainer } from "../InstanceServiceContainer.js";
2
+ import { ServiceContainer } from "../ServiceContainer.js";
3
+ export interface IDemoProviderService {
4
+ provideDemo(container: HTMLElement, serviceContainer: ServiceContainer, instanceServiceContainer: InstanceServiceContainer, code: string): any;
5
+ }
@@ -1,5 +1,6 @@
1
1
  import { CalculateGridInformation } from '../../helper/GridHelper.js';
2
2
  import { pointInRect } from '../../helper/Helper.js';
3
+ import { DefaultPlacementService } from './DefaultPlacementService';
3
4
  export class GridPlacementService {
4
5
  enterContainer(container, items) {
5
6
  for (let i of items) {
@@ -35,7 +36,8 @@ export class GridPlacementService {
35
36
  return container.element.getBoundingClientRect();
36
37
  }
37
38
  placePoint(event, placementView, container, startPoint, offsetInControl, newPoint, items) {
38
- return null;
39
+ const defaultPlacementService = container.serviceContainer.getLastServiceWhere('containerService', x => x instanceof DefaultPlacementService);
40
+ return defaultPlacementService.placePoint(event, placementView, container, startPoint, offsetInControl, newPoint, items);
39
41
  }
40
42
  place(event, placementView, container, startPoint, offsetInControl, newPoint, items) {
41
43
  const gridInformation = CalculateGridInformation(container);
@@ -49,14 +51,23 @@ export class GridPlacementService {
49
51
  column = 0;
50
52
  for (let cell of cellRow) {
51
53
  if (pointInRect(pos, cell)) {
52
- items[0].element.style.gridColumn = column + 1;
53
- items[0].element.style.gridRow = row + 1;
54
+ if (cell.name) {
55
+ items[0].element.style.gridColumn = '';
56
+ items[0].element.style.gridRow = '';
57
+ items[0].element.style.gridArea = cell.name;
58
+ }
59
+ else {
60
+ items[0].element.style.gridArea = '';
61
+ items[0].element.style.gridColumn = column + 1;
62
+ items[0].element.style.gridRow = row + 1;
63
+ }
54
64
  }
55
65
  column++;
56
66
  }
57
67
  row++;
58
68
  }
59
69
  }
70
+ placementView.extensionManager.refreshAllExtensions([container]);
60
71
  }
61
72
  finishPlace(event, placementView, container, startPoint, offsetInControl, newPoint, items) {
62
73
  const gridInformation = CalculateGridInformation(container);
@@ -68,12 +79,21 @@ export class GridPlacementService {
68
79
  column = 0;
69
80
  for (let cell of cellRow) {
70
81
  if (pointInRect(pos, cell)) {
71
- items[0].setStyle('grid-column', column + 1);
72
- items[0].setStyle('grid-row', row + 1);
82
+ if (cell.name) {
83
+ items[0].removeStyle('grid-column');
84
+ items[0].removeStyle('grid-row');
85
+ items[0].setStyle('grid-area', cell.name);
86
+ }
87
+ else {
88
+ items[0].removeStyle('grid-area');
89
+ items[0].setStyle('grid-column', column + 1);
90
+ items[0].setStyle('grid-row', row + 1);
91
+ }
73
92
  }
74
93
  column++;
75
94
  }
76
95
  row++;
77
96
  }
97
+ placementView.extensionManager.refreshAllExtensions([container]);
78
98
  }
79
99
  }
@@ -1,9 +1,11 @@
1
1
  import { IUiCommandHandler } from "../../../commandHandling/IUiCommandHandler";
2
2
  import { IDisposable } from "../../../interfaces/IDisposable";
3
3
  import { IStringPosition } from "../../services/htmlWriterService/IStringPosition";
4
+ import { TypedEvent } from '@node-projects/base-custom-webcomponent';
4
5
  export interface ICodeView extends IUiCommandHandler, IDisposable {
5
6
  update(code: string): any;
6
7
  getText(): any;
7
8
  setSelection(position: IStringPosition): any;
8
9
  focusEditor(): any;
10
+ onTextChanged: TypedEvent<string>;
9
11
  }
@@ -1,4 +1,4 @@
1
- import { BaseCustomWebComponentLazyAppend } from '@node-projects/base-custom-webcomponent';
1
+ import { BaseCustomWebComponentLazyAppend, TypedEvent } from '@node-projects/base-custom-webcomponent';
2
2
  import { ICodeView } from "./ICodeView";
3
3
  import { IStringPosition } from '../../services/htmlWriterService/IStringPosition';
4
4
  import { IUiCommand } from '../../../commandHandling/IUiCommand';
@@ -7,6 +7,7 @@ export declare class CodeViewAce extends BaseCustomWebComponentLazyAppend implem
7
7
  canvasElement: HTMLElement;
8
8
  elementsToPackages: Map<string, string>;
9
9
  code: string;
10
+ onTextChanged: TypedEvent<string>;
10
11
  private _aceEditor;
11
12
  private _editor;
12
13
  static readonly style: CSSStyleSheet;
@@ -1,4 +1,4 @@
1
- import { BaseCustomWebComponentLazyAppend, css } from '@node-projects/base-custom-webcomponent';
1
+ import { BaseCustomWebComponentLazyAppend, css, TypedEvent } from '@node-projects/base-custom-webcomponent';
2
2
  import { CommandType } from '../../../commandHandling/CommandType';
3
3
  class CodeViewAceCompleter {
4
4
  getCompletions(editor, session, pos, prefix, callback) {
@@ -18,6 +18,7 @@ export class CodeViewAce extends BaseCustomWebComponentLazyAppend {
18
18
  canvasElement;
19
19
  elementsToPackages;
20
20
  code;
21
+ onTextChanged = new TypedEvent();
21
22
  _aceEditor;
22
23
  _editor;
23
24
  static style = css `
@@ -111,6 +112,7 @@ export class CodeViewAce extends BaseCustomWebComponentLazyAppend {
111
112
  });
112
113
  let config = { attributes: true, childList: true, characterData: true };
113
114
  observer.observe(this.shadowRoot.querySelector('.ace_content'), config);
115
+ this._aceEditor.on('change', () => this.onTextChanged.emit(this._aceEditor.getValue()));
114
116
  }
115
117
  update(code) {
116
118
  this._aceEditor.setValue(code);
@@ -1,4 +1,4 @@
1
- import { BaseCustomWebComponentLazyAppend } from '@node-projects/base-custom-webcomponent';
1
+ import { BaseCustomWebComponentLazyAppend, TypedEvent } from '@node-projects/base-custom-webcomponent';
2
2
  import { ICodeView } from "./ICodeView";
3
3
  import { IStringPosition } from '../../services/htmlWriterService/IStringPosition';
4
4
  import { IUiCommand } from '../../../commandHandling/IUiCommand';
@@ -7,6 +7,7 @@ export declare class CodeViewCodeMirror extends BaseCustomWebComponentLazyAppend
7
7
  canvasElement: HTMLElement;
8
8
  elementsToPackages: Map<string, string>;
9
9
  code: string;
10
+ onTextChanged: TypedEvent<string>;
10
11
  private _codeMirrorEditor;
11
12
  private _editor;
12
13
  static readonly style: CSSStyleSheet;
@@ -1,9 +1,10 @@
1
- import { BaseCustomWebComponentLazyAppend, css, html } from '@node-projects/base-custom-webcomponent';
1
+ import { BaseCustomWebComponentLazyAppend, css, html, TypedEvent } from '@node-projects/base-custom-webcomponent';
2
2
  import { CommandType } from '../../../commandHandling/CommandType';
3
3
  export class CodeViewCodeMirror extends BaseCustomWebComponentLazyAppend {
4
4
  canvasElement;
5
5
  elementsToPackages;
6
6
  code;
7
+ onTextChanged = new TypedEvent();
7
8
  _codeMirrorEditor;
8
9
  _editor;
9
10
  static style = css `
@@ -82,6 +83,7 @@ export class CodeViewCodeMirror extends BaseCustomWebComponentLazyAppend {
82
83
  //@ts-ignore
83
84
  this._codeMirrorEditor = CodeMirror(this._editor, config);
84
85
  this._codeMirrorEditor.setSize('100%', '100%');
86
+ this._codeMirrorEditor.on('change', () => this.onTextChanged.emit(this._codeMirrorEditor.getValue()));
85
87
  }
86
88
  update(code) {
87
89
  this._codeMirrorEditor.setValue(code);
@@ -1,4 +1,4 @@
1
- import { BaseCustomWebComponentLazyAppend } from '@node-projects/base-custom-webcomponent';
1
+ import { BaseCustomWebComponentLazyAppend, TypedEvent } from '@node-projects/base-custom-webcomponent';
2
2
  import { ICodeView } from "./ICodeView";
3
3
  import { IActivateable } from '../../../interfaces/IActivateable';
4
4
  import { IStringPosition } from '../../services/htmlWriterService/IStringPosition';
@@ -9,6 +9,7 @@ export declare class CodeViewMonaco extends BaseCustomWebComponentLazyAppend imp
9
9
  canvasElement: HTMLElement;
10
10
  elementsToPackages: Map<string, string>;
11
11
  code: string;
12
+ onTextChanged: TypedEvent<string>;
12
13
  private _monacoEditor;
13
14
  private _editor;
14
15
  static readonly style: CSSStyleSheet;
@@ -1,4 +1,4 @@
1
- import { BaseCustomWebComponentLazyAppend, css, html } from '@node-projects/base-custom-webcomponent';
1
+ import { BaseCustomWebComponentLazyAppend, css, html, TypedEvent } from '@node-projects/base-custom-webcomponent';
2
2
  import { CommandType } from '../../../commandHandling/CommandType';
3
3
  export class CodeViewMonaco extends BaseCustomWebComponentLazyAppend {
4
4
  dispose() {
@@ -7,6 +7,7 @@ export class CodeViewMonaco extends BaseCustomWebComponentLazyAppend {
7
7
  canvasElement;
8
8
  elementsToPackages;
9
9
  code;
10
+ onTextChanged = new TypedEvent();
10
11
  _monacoEditor;
11
12
  _editor;
12
13
  static style = css `
@@ -69,6 +70,15 @@ export class CodeViewMonaco extends BaseCustomWebComponentLazyAppend {
69
70
  }
70
71
  });
71
72
  this._monacoEditor.layout();
73
+ let changeContentListener = this._monacoEditor.getModel().onDidChangeContent(e => {
74
+ () => this.onTextChanged.emit(this._monacoEditor.getValue());
75
+ });
76
+ this._monacoEditor.onDidChangeModel(e => {
77
+ changeContentListener.dispose();
78
+ changeContentListener = this._monacoEditor.getModel().onDidChangeContent(e => {
79
+ () => this.onTextChanged.emit(this._monacoEditor.getValue());
80
+ });
81
+ });
72
82
  });
73
83
  }
74
84
  focusEditor() {
@@ -7,5 +7,5 @@ export declare class DemoView extends BaseCustomWebComponentLazyAppend implement
7
7
  private _loading;
8
8
  static readonly style: CSSStyleSheet;
9
9
  constructor();
10
- display(serviceContainer: ServiceContainer, instanceServiceContainer: InstanceServiceContainer, code: string): void;
10
+ display(serviceContainer: ServiceContainer, instanceServiceContainer: InstanceServiceContainer, code: string): Promise<void>;
11
11
  }