Skip to content

Commit 27c9c92

Browse files
refactor: scope tree grid
1 parent 8e06dfd commit 27c9c92

7 files changed

+73
-559
lines changed

editors/dataset/data-set-editor.test.ts

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { MdIcon } from '@scopedelement/material-web/icon/MdIcon.js';
1414
import { SclSelect } from '@openenergytools/scl-select';
1515
import { SclCheckbox } from '@openenergytools/scl-checkbox';
1616
import { MdCheckbox } from '@scopedelement/material-web/checkbox/MdCheckbox.js';
17+
import { TreeGrid } from '@openenergytools/tree-grid';
1718

1819
import { dataSetDoc, otherDataSetDoc } from './data-set-editor.testfiles.js';
1920

@@ -29,6 +30,7 @@ window.customElements.define('md-icon', MdIcon);
2930
window.customElements.define('scl-select', SclSelect);
3031
window.customElements.define('scl-checkbox', SclCheckbox);
3132
window.customElements.define('md-checkbox', MdCheckbox);
33+
window.customElements.define('oscd-tree-grid', TreeGrid);
3234

3335
const factor = window.process && process.env.CI ? 4 : 2;
3436
function timeout(ms: number) {

editors/dataset/data-set-element-editor.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ import { MdDialog } from '@scopedelement/material-web/dialog/MdDialog.js';
1212
import { MdTextButton } from '@scopedelement/material-web/button/MdTextButton.js';
1313
// import '@scopedelement/material-web/icon/icon.js'
1414

15-
import '@openscd/oscd-tree-grid';
1615
import { newEditEvent } from '@openenergytools/open-scd-core';
17-
import type { TreeGrid } from '@openscd/oscd-tree-grid';
16+
import type { TreeGrid } from '@openenergytools/tree-grid';
1817
import {
1918
canAddFCDA,
2019
find,

editors/dataset/dataAttributePicker.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
/* eslint-disable import/no-extraneous-dependencies */
12
import { identity } from '@openenergytools/scl-lib';
2-
import { Tree } from '@openscd/oscd-tree-grid';
3+
import { Tree } from '@openenergytools/tree-grid';
34

45
function dataAttributeObject(da: Element): Tree {
56
const tree: Tree = {};

editors/dataset/dataObjectPicker.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
/* eslint-disable import/no-extraneous-dependencies */
12
import { identity } from '@openenergytools/scl-lib';
2-
import { Tree } from '@openscd/oscd-tree-grid';
3+
import { Tree } from '@openenergytools/tree-grid';
34

45
function subDataObjectsObject(sdo: Element): Tree {
56
const tree: Tree = {};

oscd-publisher.ts

+6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { MdOutlinedButton } from '@scopedelement/material-web/button/MdOutlinedB
1515
import { MdTextButton } from '@scopedelement/material-web/button/MdTextButton.js';
1616
import { SclCheckbox } from '@openenergytools/scl-checkbox';
1717
import { MdCheckbox } from '@scopedelement/material-web/checkbox/MdCheckbox.js';
18+
import { TreeGrid } from '@openenergytools/tree-grid';
1819

1920
import './editors/report/report-control-editor.js';
2021
import './editors/gsecontrol/gse-control-editor.js';
@@ -30,6 +31,7 @@ window.customElements.define('md-icon', MdIcon);
3031
window.customElements.define('scl-select', SclSelect);
3132
window.customElements.define('scl-checkbox', SclCheckbox);
3233
window.customElements.define('md-checkbox', MdCheckbox);
34+
window.customElements.define('oscd-tree-grid', TreeGrid);
3335

3436
/** An editor [[`plugin`]] to configure `Report`, `GOOSE`, `SampledValue` control blocks and its `DataSet` */
3537
export default class PublisherPlugin extends LitElement {
@@ -137,6 +139,10 @@ export default class PublisherPlugin extends LitElement {
137139
font-family: var(--oscd-theme-text-font);
138140
--md-sys-color-surface-container-highest: var(--oscd-base2);
139141
--md-dialog-container-color: var(--oscd-base3);
142+
143+
--md-list-item-activated-background: rgb(
144+
from var(--oscd-primary) r g b / 0.38
145+
);
140146
}
141147
142148
.hidden {

0 commit comments

Comments
 (0)