Skip to content

Commit 8688f86

Browse files
committed
fix Z's comments
1 parent f257182 commit 8688f86

File tree

4 files changed

+12
-16
lines changed

4 files changed

+12
-16
lines changed

.storybook/preview.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
$feature-flags: (
2-
components-x: true,
32
ui-shell: true
43
);
54

src/combobox/combobox.module.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { NgModule } from "@angular/core";
22
import { CommonModule } from "@angular/common";
33
import { ChevronDown16Module } from "@carbon/icons-angular/lib/chevron--down/16";
4+
import { Close16Module } from "@carbon/icons-angular/lib/close/16";
45

56
import { ComboBox } from "./combobox.component";
67
import { DropdownModule } from "../dropdown/dropdown.module";
@@ -19,7 +20,8 @@ export { ComboBox } from "./combobox.component";
1920
imports: [
2021
CommonModule,
2122
DropdownModule,
22-
ChevronDown16Module
23+
ChevronDown16Module,
24+
Close16Module
2325
]
2426
})
2527
export class ComboBoxModule {}

src/experimental.service.ts

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,31 @@ export interface Experiment {
1212
export class ExperimentalService {
1313
/**
1414
* Tracks if the v10 experimental mode is enabled
15-
* @deprecated
15+
* @deprecated since v3
1616
*/
1717
static experimentalEnabled = true;
1818

1919
/**
2020
* Sets the v10 experimental mode
21-
* @deprecated
21+
* @deprecated since v3
2222
*/
2323
set isExperimental(v: boolean) {
2424
ExperimentalService.experimentalEnabled = v;
25-
if (!v) {
26-
this.disableExperiment("v10");
27-
} else {
28-
this.enableExperiment("v10");
29-
}
3025
}
3126

3227
/**
3328
* Gets the state of the v10 experimental mode
34-
* @deprecated
29+
* @deprecated since v3
3530
*/
3631
get isExperimental() {
37-
return this.getExperiment("v10").enabled;
32+
return ExperimentalService.experimentalEnabled;
3833
}
3934

4035
/**
4136
* Map to hold all our experiments
4237
*/
4338
private experiments = new Map<string, Experiment>();
4439

45-
constructor() {
46-
this.experiments.set("v10", {enabled: true});
47-
}
48-
4940
/**
5041
* Adds an experiment if it doesn't exist.
5142
*/

src/table/table.component.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,11 @@ import { I18n } from "./../i18n/i18n.module";
414414
</ng-template>
415415
<tr *ngIf="this.model.isLoading">
416416
<td class="table_loading-indicator">
417-
417+
<div class="bx--loading bx--loading--small">
418+
<svg class="bx--loading__svg" viewBox="-75 -75 150 150">
419+
<circle class="bx--loading__stroke" cx="0" cy="0" r="37.5" />
420+
</svg>
421+
</div>
418422
</td>
419423
</tr>
420424
<tr *ngIf="this.model.isEnd">

0 commit comments

Comments
 (0)