Skip to content

Commit 4ba424d

Browse files
authored
Merge branch 'main' into bar-gauge-style
2 parents dcb14bd + 2b18510 commit 4ba424d

File tree

14 files changed

+592
-75
lines changed

14 files changed

+592
-75
lines changed

package-lock.json

Lines changed: 62 additions & 62 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
"@angular/platform-browser": "^12.2.1",
3737
"@angular/platform-browser-dynamic": "^12.2.1",
3838
"@angular/router": "^12.2.1",
39-
"@apollo/client": "^3.5.6",
39+
"@apollo/client": "^3.5.7",
4040
"@fullstory/browser": "^1.4.10",
4141
"@hypertrace/hyperdash": "^1.2.1",
4242
"@hypertrace/hyperdash-angular": "^2.6.0",
4343
"@types/d3-hierarchy": "^2.0.2",
4444
"@types/d3-transition": "1.1.5",
4545
"apollo-angular": "^2.6.0",
46-
"core-js": "^3.20.2",
46+
"core-js": "^3.20.3",
4747
"d3-array": "^2.12.0",
4848
"d3-axis": "^2.1.0",
4949
"d3-brush": "^1.1.6",
@@ -76,7 +76,7 @@
7676
"@angular/cli": "12.2.1",
7777
"@angular/compiler-cli": "~12.2.1",
7878
"@angular/language-service": "~12.2.1",
79-
"@commitlint/cli": "^16.0.1",
79+
"@commitlint/cli": "^16.1.0",
8080
"@commitlint/config-conventional": "^16.0.0",
8181
"@compodoc/compodoc": "^1.1.18",
8282
"@ngneat/spectator": "^8.3.2",
@@ -94,7 +94,7 @@
9494
"@types/jest": "^27.4.0",
9595
"@types/lodash-es": "^4.17.5",
9696
"@types/mixpanel-browser": "^2.36.0",
97-
"@types/node": "^17.0.5",
97+
"@types/node": "^17.0.10",
9898
"@types/uuid": "^8.3.4",
9999
"@types/webpack-env": "^1.16.3",
100100
"codelyzer": "^6.0.2",
@@ -107,7 +107,7 @@
107107
"jest-junit": "^13.0.0",
108108
"jest-preset-angular": "^8.4.0",
109109
"lodash": "^4.17.21",
110-
"ng-mocks": "^12.5.1",
110+
"ng-mocks": "^13.0.0",
111111
"ng-packagr": "^12.2.5",
112112
"prettier": "^2.2.1",
113113
"pretty-quick": "^3.1.3",

projects/components/src/load-async/load-async.module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ import { CommonModule } from '@angular/common';
22
import { NgModule } from '@angular/core';
33
import { IconModule } from '../icon/icon.module';
44
import { MessageDisplayModule } from '../message-display/message-display.module';
5+
import { SkeletonModule } from '../skeleton/skeleton.module';
56
import { LoadAsyncDirective } from './load-async.directive';
67
import { LoaderComponent } from './loader/loader.component';
78
import { LoadAsyncWrapperComponent } from './wrapper/load-async-wrapper.component';
89

910
@NgModule({
1011
declarations: [LoadAsyncDirective, LoadAsyncWrapperComponent, LoaderComponent],
11-
imports: [CommonModule, IconModule, MessageDisplayModule],
12+
imports: [CommonModule, IconModule, MessageDisplayModule, SkeletonModule],
1213
exports: [LoadAsyncDirective]
1314
})
1415
export class LoadAsyncModule {}

projects/components/src/load-async/load-async.service.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,14 @@ export type AsyncState = LoadingAsyncState | SuccessAsyncState | NoDataOrErrorAs
6262
export const enum LoaderType {
6363
Spinner = 'spinner',
6464
ExpandableRow = 'expandable-row',
65-
Page = 'page'
65+
Page = 'page',
66+
Rectangle = 'rectangle',
67+
Text = 'text',
68+
Square = 'square',
69+
Circle = 'circle',
70+
TableRow = 'table-row',
71+
ListItem = 'list-item',
72+
Donut = 'donut'
6673
}
6774

6875
interface LoadingAsyncState {

projects/components/src/load-async/loader/loader.component.scss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
.ht-loader {
44
width: 100%;
55
height: 100%;
6-
display: flex;
7-
flex-direction: column;
8-
justify-content: center;
9-
align-items: center;
106

117
.page {
128
height: 50px;
@@ -23,3 +19,10 @@
2319
width: auto;
2420
}
2521
}
22+
23+
.flex-centered {
24+
display: flex;
25+
flex-direction: column;
26+
justify-content: center;
27+
align-items: center;
28+
}

0 commit comments

Comments
 (0)