Skip to content

Commit 7b7c319

Browse files
driskullbenelan
authored andcommitted
refactor(action-bar, action-group, action-pad, shell, shell-panel): remove conditional slot component where not necessary (#10464)
**Related Issue:** #6059 ## Summary - removes `ConditionalSlotComponent` and helpers on components that no longer need them. - these components do not use getSlotted any longer so these should not be necessary
1 parent 80128f1 commit 7b7c319

File tree

5 files changed

+5
-58
lines changed

5 files changed

+5
-58
lines changed

packages/calcite-components/src/components/action-bar/action-bar.tsx

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ import {
1212
Watch,
1313
} from "@stencil/core";
1414
import { debounce } from "lodash-es";
15-
import {
16-
ConditionalSlotComponent,
17-
connectConditionalSlotComponent,
18-
disconnectConditionalSlotComponent,
19-
} from "../../utils/conditionalSlot";
2015
import {
2116
focusFirstTabbable,
2217
slotChangeGetAssignedElements,
@@ -57,9 +52,7 @@ import { geActionDimensions, getOverflowCount, overflowActions, queryActions } f
5752
shadow: true,
5853
assetsDirs: ["assets"],
5954
})
60-
export class ActionBar
61-
implements ConditionalSlotComponent, LoadableComponent, LocalizedComponent, T9nComponent
62-
{
55+
export class ActionBar implements LoadableComponent, LocalizedComponent, T9nComponent {
6356
// --------------------------------------------------------------------------
6457
//
6558
// Properties
@@ -228,7 +221,6 @@ export class ActionBar
228221
}
229222

230223
this.overflowActions();
231-
connectConditionalSlotComponent(this);
232224
}
233225

234226
async componentWillLoad(): Promise<void> {
@@ -239,7 +231,6 @@ export class ActionBar
239231
disconnectedCallback(): void {
240232
this.mutationObserver?.disconnect();
241233
this.resizeObserver?.disconnect();
242-
disconnectConditionalSlotComponent(this);
243234
disconnectLocalized(this);
244235
disconnectMessages(this);
245236
}

packages/calcite-components/src/components/action-group/action-group.tsx

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
import { Component, Element, h, Method, Prop, State, VNode, Watch } from "@stencil/core";
22
import { CalciteActionMenuCustomEvent } from "../../components";
3-
import {
4-
ConditionalSlotComponent,
5-
connectConditionalSlotComponent,
6-
disconnectConditionalSlotComponent,
7-
} from "../../utils/conditionalSlot";
83
import {
94
componentFocusable,
105
LoadableComponent,
@@ -40,9 +35,7 @@ import { ICONS, SLOTS, CSS } from "./resources";
4035
},
4136
assetsDirs: ["assets"],
4237
})
43-
export class ActionGroup
44-
implements ConditionalSlotComponent, LoadableComponent, LocalizedComponent, T9nComponent
45-
{
38+
export class ActionGroup implements LoadableComponent, LocalizedComponent, T9nComponent {
4639
// --------------------------------------------------------------------------
4740
//
4841
// Properties
@@ -163,13 +156,11 @@ export class ActionGroup
163156
connectedCallback(): void {
164157
connectLocalized(this);
165158
connectMessages(this);
166-
connectConditionalSlotComponent(this);
167159
}
168160

169161
disconnectedCallback(): void {
170162
disconnectLocalized(this);
171163
disconnectMessages(this);
172-
disconnectConditionalSlotComponent(this);
173164
}
174165

175166
async componentWillLoad(): Promise<void> {

packages/calcite-components/src/components/action-pad/action-pad.tsx

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ import {
1111
VNode,
1212
Watch,
1313
} from "@stencil/core";
14-
import {
15-
ConditionalSlotComponent,
16-
connectConditionalSlotComponent,
17-
disconnectConditionalSlotComponent,
18-
} from "../../utils/conditionalSlot";
1914
import { slotChangeGetAssignedElements } from "../../utils/dom";
2015
import {
2116
componentFocusable,
@@ -50,9 +45,7 @@ import { CSS, SLOTS } from "./resources";
5045
},
5146
assetsDirs: ["assets"],
5247
})
53-
export class ActionPad
54-
implements ConditionalSlotComponent, LoadableComponent, LocalizedComponent, T9nComponent
55-
{
48+
export class ActionPad implements LoadableComponent, LocalizedComponent, T9nComponent {
5649
// --------------------------------------------------------------------------
5750
//
5851
// Properties
@@ -169,7 +162,6 @@ export class ActionPad
169162
// --------------------------------------------------------------------------
170163

171164
connectedCallback(): void {
172-
connectConditionalSlotComponent(this);
173165
connectLocalized(this);
174166
connectMessages(this);
175167
this.mutationObserver?.observe(this.el, { childList: true, subtree: true });
@@ -178,7 +170,6 @@ export class ActionPad
178170
disconnectedCallback(): void {
179171
disconnectLocalized(this);
180172
disconnectMessages(this);
181-
disconnectConditionalSlotComponent(this);
182173
this.mutationObserver?.disconnect();
183174
}
184175

packages/calcite-components/src/components/shell-panel/shell-panel.tsx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ import {
1010
VNode,
1111
Watch,
1212
} from "@stencil/core";
13-
import {
14-
ConditionalSlotComponent,
15-
connectConditionalSlotComponent,
16-
disconnectConditionalSlotComponent,
17-
} from "../../utils/conditionalSlot";
1813
import {
1914
getElementDir,
2015
isPrimaryPointerButton,
@@ -46,7 +41,7 @@ import { DisplayMode } from "./interfaces";
4641
shadow: true,
4742
assetsDirs: ["assets"],
4843
})
49-
export class ShellPanel implements ConditionalSlotComponent, LocalizedComponent, T9nComponent {
44+
export class ShellPanel implements LocalizedComponent, T9nComponent {
5045
// --------------------------------------------------------------------------
5146
//
5247
// Properties
@@ -167,7 +162,6 @@ export class ShellPanel implements ConditionalSlotComponent, LocalizedComponent,
167162
//--------------------------------------------------------------------------
168163

169164
connectedCallback(): void {
170-
connectConditionalSlotComponent(this);
171165
connectLocalized(this);
172166
connectMessages(this);
173167
}
@@ -177,7 +171,6 @@ export class ShellPanel implements ConditionalSlotComponent, LocalizedComponent,
177171
}
178172

179173
disconnectedCallback(): void {
180-
disconnectConditionalSlotComponent(this);
181174
this.disconnectSeparator();
182175
disconnectLocalized(this);
183176
disconnectMessages(this);

packages/calcite-components/src/components/shell/shell.tsx

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
import { Component, Element, Fragment, h, Listen, Prop, State, VNode, Watch } from "@stencil/core";
2-
import {
3-
ConditionalSlotComponent,
4-
connectConditionalSlotComponent,
5-
disconnectConditionalSlotComponent,
6-
} from "../../utils/conditionalSlot";
72
import { slotChangeGetAssignedElements, slotChangeHasAssignedElement } from "../../utils/dom";
83
import { CSS, SLOTS } from "./resources";
94

@@ -27,7 +22,7 @@ import { CSS, SLOTS } from "./resources";
2722
styleUrl: "shell.scss",
2823
shadow: true,
2924
})
30-
export class Shell implements ConditionalSlotComponent {
25+
export class Shell {
3126
// --------------------------------------------------------------------------
3227
//
3328
// Properties
@@ -91,20 +86,6 @@ export class Shell implements ConditionalSlotComponent {
9186
this.hasOnlyPanelBottom = !this.hasPanelTop && this.hasPanelBottom;
9287
}
9388

94-
// --------------------------------------------------------------------------
95-
//
96-
// Lifecycle
97-
//
98-
// --------------------------------------------------------------------------
99-
100-
connectedCallback(): void {
101-
connectConditionalSlotComponent(this);
102-
}
103-
104-
disconnectedCallback(): void {
105-
disconnectConditionalSlotComponent(this);
106-
}
107-
10889
// --------------------------------------------------------------------------
10990
//
11091
// Private Methods

0 commit comments

Comments
 (0)