Skip to content

Commit e403078

Browse files
JeanMechemmalerba
authored andcommitted
refactor(devtools): visual separation between directives in the property tab (angular#64222)
also a drive by clean-up to remove some `ng-deep` stylings PR Close angular#64222
1 parent 34dd3f6 commit e403078

File tree

11 files changed

+21
-34
lines changed

11 files changed

+21
-34
lines changed

devtools/cypress/integration/node-selection.e2e.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ describe('node selection', () => {
6565
.last()
6666
.click({force: true});
6767

68-
cy.get('ng-property-view').last().find('mat-tree-node:contains("todo")').click();
68+
cy.get('ng-property-view').first().find('mat-tree-node:contains("todo")').click();
6969

7070
cy.get('ng-property-view')
71-
.last()
71+
.first()
7272
.find('mat-tree-node:contains("Build something fun!")')
7373
.its('length')
7474
.should('eq', 1);

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/directive-explorer.component.scss

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
:host {
22
height: 100%;
3-
4-
::ng-deep {
5-
as-split-area {
6-
overflow-y: hidden;
7-
}
8-
9-
.as-split-gutter-icon {
10-
display: none;
11-
}
12-
}
133
}
144

155
.forest-breadcrumbs {
@@ -30,6 +20,7 @@
3020
flex: 1;
3121
overflow: auto;
3222
width: 100%;
23+
background: var(--senary-contrast);
3324

3425
.no-selected-element {
3526
text-align: center;

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-tab-header/property-tab-header.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
gap: 0.375rem;
1919
padding-inline: 0.625rem;
2020
box-sizing: border-box;
21+
background: var(--color-background);
2122

2223
.component-name {
2324
@extend %body-bold-01;
@@ -71,7 +72,6 @@
7172
&.mat-accordion {
7273
.mat-expansion-panel {
7374
border: none;
74-
box-shadow: none;
7575

7676
.mat-expansion-panel-header {
7777
padding: 0;
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
.dehydrated-component {
22
padding: 0.75rem;
33
}
4-
5-
/* FRAGILE */
6-
::ng-deep {
7-
.mat-expansion-panel {
8-
border-bottom: 1px solid var(--color-separator);
9-
box-shadow: none !important;
10-
}
11-
}

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-tab.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,12 @@ export class PropertyTabComponent {
3434
if (!selected) {
3535
return;
3636
}
37-
const directives = [...selected.directives];
37+
const directives = [];
3838
if (selected.component) {
3939
directives.push(selected.component);
4040
}
41+
directives.push(...selected.directives);
42+
4143
return directives;
4244
});
4345
}

devtools/projects/ng-devtools/src/lib/devtools-tabs/directive-explorer/property-tab/property-view/property-view-body/property-view-body.component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,8 @@
5858
}
5959
}
6060
}
61+
62+
.mat-accordion-content:not(:empty):not(:last-child) {
63+
border-bottom: 1px solid var(--color-separator);
64+
}
6165
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
:host {
2+
display: block;
3+
background: var(--color-background);
4+
margin: 0.5rem;
5+
border-radius: 0.5rem;
6+
}

devtools/projects/ng-devtools/src/lib/devtools-tabs/profiler/recording-timeline/recording-visualizer/recording-visualizer.component.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
overflow: auto;
66
height: 100%;
77

8-
::ng-deep {
9-
.as-split-gutter-icon {
10-
display: none;
11-
}
12-
}
13-
148
.selected-entry {
159
padding: 0.75rem;
1610
box-sizing: border-box;

devtools/projects/ng-devtools/src/lib/devtools.component.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,3 @@
7979
margin-bottom: 1rem;
8080
}
8181
}
82-
83-
::ng-deep {
84-
.as-split-gutter-icon {
85-
display: none;
86-
}
87-
}

devtools/projects/ng-devtools/src/lib/shared/split/split.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ import {
101101
(mouseup)="clickGutter($event, $index + 1)"
102102
(touchend)="clickGutter($event, $index + 1)"
103103
>
104+
@if(showGutterIcon()) {
104105
<div class="as-split-gutter-icon"></div>
106+
}
105107
</div>
106108
}
107109
}`,
@@ -120,6 +122,7 @@ export class SplitComponent implements OnDestroy {
120122

121123
unit = input<Unit>('percent');
122124

125+
showGutterIcon = input(false, {transform: booleanAttribute});
123126
gutterSize = input(11, {transform: (v: unknown) => getInputPositiveNumber(v, 11)});
124127
gutterStep = input(1, {transform: (v: unknown) => getInputPositiveNumber(v, 1)});
125128
restrictMove = input(false, {transform: booleanAttribute});

0 commit comments

Comments
 (0)