@eclipse-glsp/client 2.2.0-next.342 → 2.2.0-next.343

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 (6) hide show
  1. package/lib/features/export/glsp-svg-exporter.d.ts +1 -1
  2. package/lib/features/export/glsp-svg-exporter.d.ts.map +1 -1
  3. package/lib/features/export/glsp-svg-exporter.js +6 -6
  4. package/lib/features/export/glsp-svg-exporter.js.map +1 -1
  5. package/package.json +3 -3
  6. package/src/features/export/glsp-svg-exporter.ts +6 -5
package/lib/features/export/glsp-svg-exporter.d.ts CHANGED
@@ -21,8 +21,8 @@ export declare class GLSPSvgExporter extends SvgExporter {
21
21
  protected prepareSvgElement(svgElement: SVGSVGElement, root: GModelRoot, request?: RequestAction<ExportSvgAction>): SVGSVGElement;
22
22
  protected copyStyles(source: Element, target: Element, skippedProperties: string[]): void;
23
23
  protected copyStyle(source: Element, target: Element, skippedProperties: string[]): void;
24
+ protected shouldUpdateStyle(element: any): element is ElementCSSInlineStyle;
24
25
  protected getSvgExport(serializedSvgElement: string, svgElement: SVGElement, root: GModelRoot, request?: RequestAction<ExportSvgAction>): string;
25
26
  protected getSvgExportStyle(svgElement: SVGElement, root: GModelRoot, request?: RequestAction<ExportSvgAction>): string | undefined;
26
27
  }
27
- export declare function isElementCSSInlineStyle(element: any): element is ElementCSSInlineStyle;
28
28
  //# sourceMappingURL=glsp-svg-exporter.d.ts.map
package/lib/features/export/glsp-svg-exporter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"glsp-svg-exporter.d.ts","sourceRoot":"","sources":["../../../src/features/export/glsp-svg-exporter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIhG,qBACa,eAAgB,SAAQ,WAAW;IACnC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,GAAG,IAAI;cAa9D,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,GAAG,MAAM;IAWjF,SAAS,CAAC,cAAc,IAAI,aAAa,GAAG,IAAI;IAMhD,SAAS,CAAC,iBAAiB,CAAC,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,GAAG,aAAa;cAI9G,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,GAAG,IAAI;IAalG,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,GAAG,IAAI;IA0BxF,SAAS,CAAC,YAAY,CAClB,oBAAoB,EAAE,MAAM,EAC5B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,UAAU,EAChB,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,GACzC,MAAM;IAKT,SAAS,CAAC,iBAAiB,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,GAAG,MAAM,GAAG,SAAS;CAUtI;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,IAAI,qBAAqB,CAEtF"}
1
+ {"version":3,"file":"glsp-svg-exporter.d.ts","sourceRoot":"","sources":["../../../src/features/export/glsp-svg-exporter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIhG,qBACa,eAAgB,SAAQ,WAAW;IACnC,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,GAAG,IAAI;cAa9D,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,GAAG,MAAM;IAWjF,SAAS,CAAC,cAAc,IAAI,aAAa,GAAG,IAAI;IAMhD,SAAS,CAAC,iBAAiB,CAAC,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,GAAG,aAAa;cAI9G,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,GAAG,IAAI;IAalG,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,GAAG,IAAI;IA0BxF,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,IAAI,qBAAqB;IAK3E,SAAS,CAAC,YAAY,CAClB,oBAAoB,EAAE,MAAM,EAC5B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,UAAU,EAChB,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,GACzC,MAAM;IAKT,SAAS,CAAC,iBAAiB,CAAC,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,eAAe,CAAC,GAAG,MAAM,GAAG,SAAS;CAUtI"}
package/lib/features/export/glsp-svg-exporter.js CHANGED
@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  };
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.isElementCSSInlineStyle = exports.GLSPSvgExporter = void 0;
9
+ exports.GLSPSvgExporter = void 0;
10
10
  /********************************************************************************
11
11
  * Copyright (c) 2022-2023 EclipseSource and others.
12
12
  *
@@ -78,7 +78,7 @@ let GLSPSvgExporter = class GLSPSvgExporter extends sprotty_1.SvgExporter {
78
78
  const propertyValue = sourceStyle.getPropertyValue(propertyName);
79
79
  const propertyPriority = sourceStyle.getPropertyPriority(propertyName);
80
80
  if (targetStyle.getPropertyValue(propertyName) !== propertyValue) {
81
- if (isElementCSSInlineStyle(target)) {
81
+ if (this.shouldUpdateStyle(target)) {
82
82
  // rather set the property directly on the element to keep other values intact
83
83
  target.style.setProperty(propertyName, propertyValue);
84
84
  }
@@ -93,6 +93,10 @@ let GLSPSvgExporter = class GLSPSvgExporter extends sprotty_1.SvgExporter {
93
93
  target.setAttribute('style', style.trim());
94
94
  }
95
95
  }
96
+ shouldUpdateStyle(element) {
97
+ // we want to simply update the style of elements and keep other values intact if they have a style property
98
+ return 'tagName' in element && 'style' in element;
99
+ }
96
100
  getSvgExport(serializedSvgElement, svgElement, root, request) {
97
101
  const svgExportStyle = this.getSvgExportStyle(svgElement, root, request);
98
102
  return svgExportStyle ? serializedSvgElement.replace('style="', `style="${svgExportStyle}`) : serializedSvgElement;
@@ -110,8 +114,4 @@ exports.GLSPSvgExporter = GLSPSvgExporter;
110
114
  exports.GLSPSvgExporter = GLSPSvgExporter = __decorate([
111
115
  (0, inversify_1.injectable)()
112
116
  ], GLSPSvgExporter);
113
- function isElementCSSInlineStyle(element) {
114
- return 'style' in element && element.style instanceof CSSStyleDeclaration;
115
- }
116
- exports.isElementCSSInlineStyle = isElementCSSInlineStyle;
117
117
  //# sourceMappingURL=glsp-svg-exporter.js.map
package/lib/features/export/glsp-svg-exporter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"glsp-svg-exporter.js","sourceRoot":"","sources":["../../../src/features/export/glsp-svg-exporter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"glsp-svg-exporter.js","sourceRoot":"","sources":["../../../src/features/export/glsp-svg-exporter.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eclipse-glsp/client",
3
- "version": "2.2.0-next.342+fb31fc2",
3
+ "version": "2.2.0-next.343+fce3a6a",
4
4
  "description": "A sprotty-based client for GLSP",
5
5
  "keywords": [
6
6
  "eclipse",
@@ -46,7 +46,7 @@
46
46
  "watch": "tsc -w"
47
47
  },
48
48
  "dependencies": {
49
- "@eclipse-glsp/sprotty": "2.2.0-next.342+fb31fc2",
49
+ "@eclipse-glsp/sprotty": "2.2.0-next.343+fce3a6a",
50
50
  "autocompleter": "^9.1.0",
51
51
  "file-saver": "^2.0.5",
52
52
  "lodash": "4.17.21"
@@ -61,5 +61,5 @@
61
61
  "publishConfig": {
62
62
  "access": "public"
63
63
  },
64
- "gitHead": "fb31fc22d9b5eb7244c7c0aa4a53f55d979e8d56"
64
+ "gitHead": "fce3a6a6ce57c215d995e40c1d5eaebdc3c36b08"
65
65
  }
package/src/features/export/glsp-svg-exporter.ts CHANGED
@@ -77,7 +77,7 @@ export class GLSPSvgExporter extends SvgExporter {
77
77
  const propertyValue = sourceStyle.getPropertyValue(propertyName);
78
78
  const propertyPriority = sourceStyle.getPropertyPriority(propertyName);
79
79
  if (targetStyle.getPropertyValue(propertyName) !== propertyValue) {
80
- if (isElementCSSInlineStyle(target)) {
80
+ if (this.shouldUpdateStyle(target)) {
81
81
  // rather set the property directly on the element to keep other values intact
82
82
  target.style.setProperty(propertyName, propertyValue);
83
83
  } else {
@@ -92,6 +92,11 @@ export class GLSPSvgExporter extends SvgExporter {
92
92
  }
93
93
  }
94
94
 
95
+ protected shouldUpdateStyle(element: any): element is ElementCSSInlineStyle {
96
+ // we want to simply update the style of elements and keep other values intact if they have a style property
97
+ return 'tagName' in element && 'style' in element;
98
+ }
99
+
95
100
  protected getSvgExport(
96
101
  serializedSvgElement: string,
97
102
  svgElement: SVGElement,
@@ -113,7 +118,3 @@ export class GLSPSvgExporter extends SvgExporter {
113
118
  );
114
119
  }
115
120
  }
116
-
117
- export function isElementCSSInlineStyle(element: any): element is ElementCSSInlineStyle {
118
- return 'style' in element && element.style instanceof CSSStyleDeclaration;
119
- }