arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature(digi-migrering): Utfasning av digi-ng-typography-dynamic-header. (TV-858)

Browse Source 
Merge in TEA/mina-sidor-fa-web from feature/TV-858-digi-ng-typography-dynamic-heading to develop

Squashed commit of the following:

commit 31384faf8c31562024882ea26b74a79be7ab71fa
Author: WP\holno <nikola.holst-nikolic@arbetsformedlingen.se>
Date:   Wed Dec 1 11:15:19 2021 +0100

    - Removed digi-ng-typography-dynamic-header and typographyDynamicHeadingLevel, replaced with a h3.
    - Overkill to create a ui-component for this as it's only used in one place and the headingLevel-input never gets a value and falls back on default h3.
This commit is contained in:
Nikola Holst Nikolic
2021-12-01 12:44:34 +01:00
parent a387aad5bd
commit 395452e60e
4 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/mina-sidor-fa/src/app/shared/components/tree-nodes-selector/components/expanded-tree-node/expanded-tree-node.component.html
View File

@@ -5,11 +5,7 @@
}"
>
<div class="expanded-tree-node__content">
<digi-ng-typography-dynamic-heading
class="expanded-tree-node__heading"
[afText]="headingText"
[afLevel]="headingLevel"
></digi-ng-typography-dynamic-heading>
<h3 *ngIf="headingText" class="expanded-tree-node__heading">{{ headingText }}</h3>
<ng-container *ngIf="showGeneralInfo else treeNodeChildrenTemplate">
<p class="expanded-tree-node__info">{{generalInfo}}</p>
</ng-container>

13
apps/mina-sidor-fa/src/app/shared/components/tree-nodes-selector/components/expanded-tree-node/expanded-tree-node.component.scss
View File

@@ -29,21 +29,12 @@
}
&__heading {
margin: 0;
font-size: 1rem;
padding: 0 0.9375rem;
display: block;
font-weight: 600;
::ng-deep {
h1,
h2,
h3,
h4,
h5,
h6 {
max-width: 100%;
}
}
max-width: 100%;
}
&__nodes {

2
apps/mina-sidor-fa/src/app/shared/components/tree-nodes-selector/components/expanded-tree-node/expanded-tree-node.component.ts
View File

@@ -1,4 +1,3 @@
import { TypographyDynamicHeadingLevel } from '@af/digi-ng/_typography/typography-dynamic-heading';
import {
Component,
ChangeDetectionStrategy,
@@ -27,7 +26,6 @@ import {
})
export class ExpandedTreeNodeComponent extends UnsubscribeDirective implements OnChanges {
@Input() treeNodeModel: TreeNodeModel;
@Input() headingLevel: TypographyDynamicHeadingLevel = TypographyDynamicHeadingLevel.H3;
@Input() headingText: string;
@Input() showGeneralInfo: boolean;
@Input() generalInfo: string;

10
apps/mina-sidor-fa/src/app/shared/components/tree-nodes-selector/tree-nodes-selector.module.ts
View File

@@ -3,12 +3,16 @@ import { CommonModule } from '@angular/common';
import { TreeNodesSelectorPanelComponent } from './components/tree-nodes-selector-panel/tree-nodes-selector-panel.component';
import { TreeNodesSelectorComponent } from './components/tree-nodes-selector/tree-nodes-selector.component';
import { ExpandedTreeNodeComponent } from './components/expanded-tree-node/expanded-tree-node.component';
import { DigiNgTypographyDynamicHeadingModule } from '@af/digi-ng/_typography/typography-dynamic-heading';
import { AriaLabelTextForExpansionBtnPipe } from './pipes/aria-label-text-for-expansion-btn.pipe';
@NgModule({
declarations: [TreeNodesSelectorComponent, TreeNodesSelectorPanelComponent, ExpandedTreeNodeComponent, AriaLabelTextForExpansionBtnPipe],
imports: [CommonModule, DigiNgTypographyDynamicHeadingModule],
declarations: [
TreeNodesSelectorComponent,
TreeNodesSelectorPanelComponent,
ExpandedTreeNodeComponent,
AriaLabelTextForExpansionBtnPipe,
],
imports: [CommonModule],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
exports: [TreeNodesSelectorComponent],
})