Skip to content

Commit

Permalink
simpleFilters demo 2 version
Browse files Browse the repository at this point in the history
  • Loading branch information
@matt-litwiller
matt-litwiller committed Aug 9, 2023
1 parent 6387af5 commit 0241b15
Show file tree
Hide file tree
Showing 10 changed files with 27,545 additions and 2,562 deletions.
29,785 changes: 27,487 additions & 2,298 deletions package-lock.json
View file

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions src/app/app.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,5 @@
></app-simple-feature-list>
</div>
</div>
<div *ngIf="!useEmbeddedVersion" class="no-embedded-version">
<app-portal *ngIf="!hasMenu" [ngClass]="hasHeader? 'portal-hasHeader': 'portal'"></app-portal>
</div>

<app-portal *ngIf="!hasMenu && !useEmbeddedVersion" [ngClass]="hasHeader? 'portal-hasHeader': 'portal'"></app-portal>
3 changes: 0 additions & 3 deletions src/app/app.component.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,4 @@ spinner-with-legend-dialog {
height: fit-content;
}

.no-embedded-version {
height: 100%;
}

2 changes: 1 addition & 1 deletion src/app/pages/portal/legend-button/legend-button.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ import {MAT_DIALOG_DATA, MatDialogModule, MatDialogRef} from '@angular/material/
LegendButtonDialogComponent,
MatIconModule
],
// bootstrap: [LegendButtonComponent],
bootstrap: [LegendButtonComponent],
})
export class LegendButtonModule { }
288 changes: 42 additions & 246 deletions src/app/pages/portal/portal.animation.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,170 +9,50 @@ import {
AnimationTriggerMetadata
} from '@angular/animations';

export function expansionPanelAnimation(): AnimationTriggerMetadata[] {
return [
trigger('expansionPanelSize', [
state(
'full',
style({
left: '5px',
'max-width': '100%'
})
),
state(
'notTriggered',
style({
left: '5px',
bottom: '5px',
'max-width': '100%'
})
),
state(
'notVisible',
style({
display: 'none'
})
),
state(
'mobile',
style({
left: 'calc(100% - 40px)',
})
),
state(
'reduced',
style({
left: '405px',
'max-width': 'calc(100% - 405px)'
})
),
state(
'reducedNotTriggered',
style({
left: '405px',
bottom: '5px',
'max-width': 'calc(100% - 405px)'
})
),
transition('* => *', animate('100ms'))
]),
trigger('toastOffsetY', [
state(
'true',
style({
bottom: '50px'
})
),
state(
'false',
style({
bottom: '5px'
})
)
])
];
export function controlSlideX(): AnimationTriggerMetadata {
return trigger('controlStateX', [
state(
'left',
style({
left: '60px'
})
),
state(
'right',
style({
left: '465px'
})
),
transition('* => *', animate('200ms'))
]);
}

export function toastPanelAnimation(): AnimationTriggerMetadata[] {
return [
trigger('toastPanelMobileSidenav', [
state(
'true',
style({
display: 'none'
})
),
transition('* => void', animate('0ms')),
transition('* => *', animate('200ms'))
]),
trigger('toastPanelOffsetX', [
state(
'fullStandard',
style({
left: '45%'
})
),
state(
'standard',
style({
left: '50%'
})
),
state(
'htmlDisplay',
style({
left: '40%'
})
),
state(
'fullOffsetX',
style({
left: 'calc(45% + 202px)'
})
),
state(
'standardOffsetX',
style({
left: 'calc(50% + 202px)'
})
),
state(
'htmlDisplayOffsetX',
style({
left: 'calc(40% + 160px)'
})
export function controlSlideY(): AnimationTriggerMetadata {
return trigger('controlStateY', [
state('close', style({})),
state(
'firstRowFromBottom',
style({
bottom: '2px',
'margin-left': '0px'
})
),
transition('fullStandard => fullOffsetX', animate('200ms')),
transition('fullOffsetX => fullStandard', animate('200ms')),
transition('standard => standardOffsetX', animate('200ms')),
transition('standardOffsetX => standard', animate('200ms')),
transition('htmlDisplay => htmlDisplayOffsetX', animate('200ms')),
transition('htmlDisplayOffsetX => htmlDisplay', animate('200ms')),
// transition('standard => htmlDisplay', animate('200ms')),
// transition('htmlDisplay => standard', animate('200ms')),
]),
trigger('toastPanelOffsetY', [
state(
'noExpansion',
style({
bottom: '0'
})
),
state(
'expansionAndToastOpened',
style({
bottom: '285px',
zIndex: '999'
})
),
state(
'expansionAndToastClosed',
style({
bottom: '285px',
zIndex: '5'
})
),
state(
'expansionMaximizedAndToastOpened',
style({
bottom: '500px', // workspace full size
zIndex: '999'
})
),
state(
'expansionMaximizedAndToastClosed',
style({
bottom: '500px', // workspace full size
zIndex: '5'
})
),
transition('noExpansion => noExpansion', animate('10ms')),
transition('expansionAndToastOpened => expansionAndToastOpened', animate('200ms')),
transition('expansionAndToastClosed => expansionAndToastClosed', animate('200ms')),
transition('expansionMaximizedAndToastOpened => expansionMaximizedAndToastOpened', animate('200ms')),
transition('expansionMaximizedAndToastClosed => expansionMaximizedAndToastClosed', animate('200ms')),
])
];
state(
'firstRowFromBottom-expanded',
style({
bottom: '285px',
'margin-left': '-55px'
})
),
state(
'firstRowFromBottom-expanded-maximized',
style({
bottom: '500px', // workspace full size
'margin-left': '-55px'
})
),
transition('* => *', animate('200ms'))
]);
}

export function controlsAnimations(): AnimationTriggerMetadata[] {
Expand Down Expand Up @@ -228,90 +108,6 @@ export function controlsAnimations(): AnimationTriggerMetadata[] {
})
),
transition('* => *', animate('200ms'))
]),
trigger('mobileOffsetY', [
state(
'low',
style({
bottom: '50px'
})
),
transition('* => *', animate('200ms'))
])
];
}

export function controlSlideX(): AnimationTriggerMetadata {
return trigger('controlStateX', [
state(
'left',
style({
left: '60px'
})
),
state(
'right',
style({
left: '465px'
})
),
transition('* => *', animate('200ms'))
]);
}

export function controlSlideY(): AnimationTriggerMetadata {
return trigger('controlStateY', [
state('close', style({})),
state(
'firstRowFromBottom',
style({
bottom: '2px',
'margin-left': '0px'
})
),
state(
'firstRowFromBottom-expanded',
style({
bottom: '285px',
'margin-left': '-55px'
})
),
state(
'firstRowFromBottom-expanded-maximized',
style({
bottom: '500px', // workspace full size
'margin-left': '-55px'
})
),
transition('* => *', animate('200ms'))
]);
}

export function mapSlideX(): AnimationTriggerMetadata {
return trigger('mapStateX', [
state(
'left',
style({
left: '0'
})
),
state(
'right',
style({
left: '0'
})
),
transition('* => *', animate('200ms'))
]);
}
export function mapSlideY(): AnimationTriggerMetadata {
return trigger('mapStateY', [
state(
'*',
style({
bottom: '0'
})
),
transition('* => *', animate('200ms'))
]);
}
}
4 changes: 2 additions & 2 deletions src/app/pages/portal/portal.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<mat-sidenav-container *ngIf="showMap && !hasToolbox" class="sidenav">
<mat-sidenav-container *ngIf="showMap && !hasToolbox">
<mat-sidenav-content position="end">

<igo-backdrop
Expand Down Expand Up @@ -66,7 +66,7 @@
[igoContextMenu]=contextMenu
(menuPosition)="onContextMenuOpen($event)"
[ngClass]="{'igo-attribution-offset': map.getBaseLayers().length > 1}">

<igo-baselayers-switcher
[ngClass]="sidenavOpened? ['baselayers-pushed'] : (mobile? ['igo-baselayers-switcher-mobile'] : ['baselayers'])"
[map]="map"
Expand Down
1 change: 1 addition & 0 deletions src/app/pages/portal/portal.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@ export class PortalComponent implements OnInit, OnDestroy {
if (workspaceEmpty) {
this.expansionPanelExpanded = false;
}
this.updateMapBrowserClass();
});

this.map.layers$.subscribe( layerList => {
Expand Down
1 change: 1 addition & 0 deletions src/app/pages/portal/sideresult/bottomresult.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ export class BottomResultComponent implements OnInit, OnDestroy {
}

onSearch(event: { research: Research; results: SearchResult[] }) {
console.log('onSearch');
const results = event.results;
this.searchStore.state.updateAll({ focused: false, selected: false });
const newResults = this.searchStore.entities$.value
Expand Down
Loading

0 comments on commit 0241b15

Please sign in to comment.