feature(digi-migrering): Utfasning av digi-ng-typography-dynamic-header. (TV-858)
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:
@@ -5,11 +5,7 @@
|
|||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
<div class="expanded-tree-node__content">
|
<div class="expanded-tree-node__content">
|
||||||
<digi-ng-typography-dynamic-heading
|
<h3 *ngIf="headingText" class="expanded-tree-node__heading">{{ headingText }}</h3>
|
||||||
class="expanded-tree-node__heading"
|
|
||||||
[afText]="headingText"
|
|
||||||
[afLevel]="headingLevel"
|
|
||||||
></digi-ng-typography-dynamic-heading>
|
|
||||||
<ng-container *ngIf="showGeneralInfo else treeNodeChildrenTemplate">
|
<ng-container *ngIf="showGeneralInfo else treeNodeChildrenTemplate">
|
||||||
<p class="expanded-tree-node__info">{{generalInfo}}</p>
|
<p class="expanded-tree-node__info">{{generalInfo}}</p>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|||||||
@@ -29,21 +29,12 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&__heading {
|
&__heading {
|
||||||
|
margin: 0;
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
padding: 0 0.9375rem;
|
padding: 0 0.9375rem;
|
||||||
display: block;
|
display: block;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
|
max-width: 100%;
|
||||||
::ng-deep {
|
|
||||||
h1,
|
|
||||||
h2,
|
|
||||||
h3,
|
|
||||||
h4,
|
|
||||||
h5,
|
|
||||||
h6 {
|
|
||||||
max-width: 100%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
&__nodes {
|
&__nodes {
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { TypographyDynamicHeadingLevel } from '@af/digi-ng/_typography/typography-dynamic-heading';
|
|
||||||
import {
|
import {
|
||||||
Component,
|
Component,
|
||||||
ChangeDetectionStrategy,
|
ChangeDetectionStrategy,
|
||||||
@@ -27,7 +26,6 @@ import {
|
|||||||
})
|
})
|
||||||
export class ExpandedTreeNodeComponent extends UnsubscribeDirective implements OnChanges {
|
export class ExpandedTreeNodeComponent extends UnsubscribeDirective implements OnChanges {
|
||||||
@Input() treeNodeModel: TreeNodeModel;
|
@Input() treeNodeModel: TreeNodeModel;
|
||||||
@Input() headingLevel: TypographyDynamicHeadingLevel = TypographyDynamicHeadingLevel.H3;
|
|
||||||
@Input() headingText: string;
|
@Input() headingText: string;
|
||||||
@Input() showGeneralInfo: boolean;
|
@Input() showGeneralInfo: boolean;
|
||||||
@Input() generalInfo: string;
|
@Input() generalInfo: string;
|
||||||
|
|||||||
@@ -3,12 +3,16 @@ import { CommonModule } from '@angular/common';
|
|||||||
import { TreeNodesSelectorPanelComponent } from './components/tree-nodes-selector-panel/tree-nodes-selector-panel.component';
|
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 { TreeNodesSelectorComponent } from './components/tree-nodes-selector/tree-nodes-selector.component';
|
||||||
import { ExpandedTreeNodeComponent } from './components/expanded-tree-node/expanded-tree-node.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';
|
import { AriaLabelTextForExpansionBtnPipe } from './pipes/aria-label-text-for-expansion-btn.pipe';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [TreeNodesSelectorComponent, TreeNodesSelectorPanelComponent, ExpandedTreeNodeComponent, AriaLabelTextForExpansionBtnPipe],
|
declarations: [
|
||||||
imports: [CommonModule, DigiNgTypographyDynamicHeadingModule],
|
TreeNodesSelectorComponent,
|
||||||
|
TreeNodesSelectorPanelComponent,
|
||||||
|
ExpandedTreeNodeComponent,
|
||||||
|
AriaLabelTextForExpansionBtnPipe,
|
||||||
|
],
|
||||||
|
imports: [CommonModule],
|
||||||
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
schemas: [CUSTOM_ELEMENTS_SCHEMA],
|
||||||
exports: [TreeNodesSelectorComponent],
|
exports: [TreeNodesSelectorComponent],
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user