@node-projects/web-component-designer-widgets-wunderbaum 0.1.21 → 0.1.23

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,5 +1,7 @@
1
+ /// <reference types="wunderbaum" />
1
2
  import { BaseCustomWebComponentConstructorAppend } from '@node-projects/base-custom-webcomponent';
2
3
  import { ITreeView, InstanceServiceContainer, IDesignItem, ContextMenu, ISelectionChangedEvent } from '@node-projects/web-component-designer';
4
+ import { WunderbaumNode } from 'wb_node';
3
5
  export declare class TreeViewExtended extends BaseCustomWebComponentConstructorAppend implements ITreeView {
4
6
  private _treeDiv;
5
7
  private _tree;
@@ -18,9 +20,11 @@ export declare class TreeViewExtended extends BaseCustomWebComponentConstructorA
18
20
  _showHideAtRunTimeState(img: HTMLImageElement, designItem: IDesignItem): void;
19
21
  _switchHideAtRunTimeState(img: HTMLImageElement, designItem: IDesignItem): void;
20
22
  showDesignItemContextMenu(designItem: IDesignItem, event: MouseEvent): ContextMenu;
23
+ selectedFromTree: boolean;
21
24
  ready(): Promise<void>;
22
25
  _recomputeRunning: any;
23
26
  _recomputeRequestedAgain: any;
27
+ refreshNode(node: WunderbaumNode, item: IDesignItem): Promise<void>;
24
28
  createTree(rootItem: IDesignItem): Promise<void>;
25
29
  set instanceServiceContainer(value: InstanceServiceContainer);
26
30
  selectionChanged(event: ISelectionChangedEvent): void;
@@ -4,6 +4,7 @@ import { Wunderbaum } from 'wunderbaum';
4
4
  import { defaultOptions, defaultStyle } from '../WunderbaumOptions.js';
5
5
  //@ts-ignore
6
6
  import wunderbaumStyle from 'wunderbaum/dist/wunderbaum.css' with { type: 'css' };
7
+ const wbNodeSymbol = Symbol.for('wunderbaumnode');
7
8
  export class TreeViewExtended extends BaseCustomWebComponentConstructorAppend {
8
9
  _treeDiv;
9
10
  _tree;
@@ -50,10 +51,15 @@ export class TreeViewExtended extends BaseCustomWebComponentConstructorAppend {
50
51
  border-radius: 50%;
51
52
  width: 10px;
52
53
  height: 10px;
53
- background: orange;
54
+ background: transparent;
55
+ pointer-events: none;
54
56
  top: 5px;
55
57
  left: 5px;
56
58
  position: relative;
59
+ }
60
+ div.isforced {
61
+ background: orange;
62
+ pointer-events: all;
57
63
  }`;
58
64
  static template = html `
59
65
  <div style="height: 100%;">
@@ -131,6 +137,7 @@ export class TreeViewExtended extends BaseCustomWebComponentConstructorAppend {
131
137
  let ctxMnu = ContextMenu.show(mnuItems, event);
132
138
  return ctxMnu;
133
139
  }
140
+ selectedFromTree = false;
134
141
  async ready() {
135
142
  this._tree = new Wunderbaum({
136
143
  ...defaultOptions,
@@ -141,6 +148,10 @@ export class TreeViewExtended extends BaseCustomWebComponentConstructorAppend {
141
148
  let node = e.node;
142
149
  let designItem = node.data.ref;
143
150
  if (designItem) {
151
+ this.selectedFromTree = true;
152
+ setTimeout(() => {
153
+ this.selectedFromTree = false;
154
+ }, 50);
144
155
  if (e.event.ctrlKey) {
145
156
  const sel = [...designItem.instanceServiceContainer.selectionService.selectedElements];
146
157
  const idx = sel.indexOf(designItem);
@@ -247,16 +258,17 @@ export class TreeViewExtended extends BaseCustomWebComponentConstructorAppend {
247
258
  imgH.title = 'hide at runtime';
248
259
  d.appendChild(imgH);
249
260
  rowElem.appendChild(d);
261
+ const f = document.createElement("div");
262
+ f.className = "forced";
263
+ f.title = "has forced style";
264
+ rowElem.appendChild(f);
265
+ f.addEventListener('click', (event) => {
266
+ const items = new ForceCssContextMenu().provideContextMenuItems(event, item.instanceServiceContainer.designerCanvas, item);
267
+ let ctxMenu = new ContextMenu(items, null);
268
+ ctxMenu.display(event);
269
+ });
250
270
  if (item.hasForcedCss) {
251
- const f = document.createElement("div");
252
- f.className = "forced";
253
- f.title = "has forced style";
254
- rowElem.appendChild(f);
255
- f.addEventListener('click', (event) => {
256
- const items = new ForceCssContextMenu().provideContextMenuItems(event, item.instanceServiceContainer.designerCanvas, item);
257
- let ctxMenu = new ContextMenu(items, null);
258
- ctxMenu.display(event);
259
- });
271
+ f.className = "forced isforced";
260
272
  }
261
273
  }
262
274
  }
@@ -266,6 +278,14 @@ export class TreeViewExtended extends BaseCustomWebComponentConstructorAppend {
266
278
  }
267
279
  _recomputeRunning;
268
280
  _recomputeRequestedAgain;
281
+ async refreshNode(node, item) {
282
+ const el = node.getColElem(0).parentElement;
283
+ const f = el.querySelector('.forced');
284
+ if (item.hasForcedCss)
285
+ f.classList.add('isforced');
286
+ else
287
+ f.classList.remove('isforced');
288
+ }
269
289
  async createTree(rootItem) {
270
290
  if (this._tree) {
271
291
  if (!this._recomputeRunning) {
@@ -293,10 +313,17 @@ export class TreeViewExtended extends BaseCustomWebComponentConstructorAppend {
293
313
  });
294
314
  this._contentChangedHandler?.dispose();
295
315
  this._contentChangedHandler = this._instanceServiceContainer.contentService.onContentChanged.on(e => {
296
- this.createTree(value.contentService.rootDesignItem);
297
- setTimeout(() => {
298
- this._highlight(this._instanceServiceContainer.selectionService.selectedElements);
299
- }, 20);
316
+ if (e.changeType === 'changed') {
317
+ for (const d of e.designItems) {
318
+ this.refreshNode(d[wbNodeSymbol], d);
319
+ }
320
+ }
321
+ else {
322
+ this.createTree(value.contentService.rootDesignItem);
323
+ setTimeout(() => {
324
+ this._highlight(this._instanceServiceContainer.selectionService.selectedElements);
325
+ }, 20);
326
+ }
300
327
  });
301
328
  this.createTree(value.contentService.rootDesignItem);
302
329
  }
@@ -322,6 +349,8 @@ export class TreeViewExtended extends BaseCustomWebComponentConstructorAppend {
322
349
  title: item.isRootItem ? '-root-' : item.nodeType === NodeType.Element ? item.name + " " + (item.id ? ('#' + item.id) : '') : '<small><small><small>#' + (item.nodeType === NodeType.TextNode ? 'text' : 'comment') + '&nbsp;</small></small></small> ' + DomConverter.normalizeContentValue(item.content),
323
350
  ref: item
324
351
  });
352
+ //@ts-ignore
353
+ item[wbNodeSymbol] = newNode;
325
354
  for (let i of item.children()) {
326
355
  if (!i.isEmptyTextNode) {
327
356
  this._getChildren(i, newNode);
@@ -333,15 +362,19 @@ export class TreeViewExtended extends BaseCustomWebComponentConstructorAppend {
333
362
  this._tree.runWithDeferredUpdate(() => {
334
363
  this._tree.visit((node) => {
335
364
  const flag = activeElements && activeElements.includes(node.data.ref);
336
- node.setSelected(flag);
337
- node.setActive(flag);
338
- if (flag)
339
- node.setFocus(true);
340
- if (flag && !scrolled) {
341
- scrolled = true;
342
- requestAnimationFrame(() => {
343
- node.scrollIntoView();
344
- });
365
+ if (flag != node.selected)
366
+ node.setSelected(flag);
367
+ if (flag != node.isActive())
368
+ node.setActive(flag);
369
+ if (!this.selectedFromTree) {
370
+ if (flag)
371
+ node.setFocus(true);
372
+ if (flag && !scrolled) {
373
+ scrolled = true;
374
+ requestAnimationFrame(() => {
375
+ node.scrollIntoView();
376
+ });
377
+ }
345
378
  }
346
379
  });
347
380
  });
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "description": "web-component-designer addon: Widgets using wunderbaum",
3
3
  "name": "@node-projects/web-component-designer-widgets-wunderbaum",
4
- "version": "0.1.21",
4
+ "version": "0.1.23",
5
5
  "type": "module",
6
6
  "main": "./dist/index.js",
7
7
  "author": "jochen.kuehner@gmx.de",
@@ -9,6 +9,7 @@
9
9
  "scripts": {
10
10
  "tsc": "tsc",
11
11
  "build": "tsc",
12
+ "link": "npm link",
12
13
  "prepublishOnly": "npm run build"
13
14
  },
14
15
  "dependencies": {