Skip to content

Commit

Permalink
fix: search bar not covering buttons correctly (#145)
Browse files Browse the repository at this point in the history
* fix: search bar not covering buttons correctly

* update expandable-input

* update patch version

---------

Co-authored-by: Alexander Bashmakov <[email protected]>
  • Loading branch information
DmitryEfimenko and abashmak authored Aug 7, 2023
1 parent f39ad28 commit 305555b
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 9 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "opp",
"version": "1.3.0",
"version": "1.3.1",
"license": "MIT",
"engines": {
"node": ">=18.10.0",
Expand Down Expand Up @@ -40,7 +40,7 @@
"@ngneat/elf": "^2.3.0",
"@ngneat/elf-cli-ng": "^1.0.0",
"@ngneat/elf-entities": "^4.4.3",
"@ngspot/expandable-input": "^3.0.0",
"@ngspot/expandable-input": "^3.0.1",
"@ngspot/ngx-errors": "^3.2.1",
"core-js": "^3.1.3",
"ng-let": "^15.0.1",
Expand Down Expand Up @@ -97,4 +97,4 @@
]
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

<div
class="same-area"
[@z-index]="searchExpInput.isOpen"
[@margin-right]="searchExpInput.isOpen"
[@smoothHorizontalCollapse]="addCategoryForm.isOpen"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import {
import { UntypedFormControl } from '@angular/forms';
import { MatExpansionPanelHeader } from '@angular/material/expansion';
import {
animateCssProperty,
ANIMATION_DURATION,
ANIMATION_EASING,
ExpandableInputComponent,
animateCssProperty,
smoothHorizontalCollapse,
} from '@ngspot/expandable-input';
import { unparse } from 'papaparse';
Expand All @@ -30,7 +30,7 @@ import {
IUpdateCategoryPayload,
IUpdateItemPayload,
} from '../../models';
import { paginate, PaginationService } from '../../services/pagination';
import { PaginationService, paginate } from '../../services/pagination';
import { CategoriesRepository } from '../../state';

@Component({
Expand Down Expand Up @@ -58,6 +58,13 @@ import { CategoriesRepository } from '../../state';
durationMs: ANIMATION_DURATION,
easing: ANIMATION_EASING,
}),
animateCssProperty({
propName: 'z-index',
falseValue: '',
trueValue: '10',
durationMs: ANIMATION_DURATION,
easing: ANIMATION_EASING,
}),
],
})
export class CategoryListComponent implements OnInit, AfterViewInit, OnDestroy {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2536,10 +2536,10 @@
resolved "https://registry.yarnpkg.com/@ngneat/elf/-/elf-2.3.0.tgz#c046b0344b05ffdd2e0735122a31dfa2d67c6794"
integrity sha512-uGoKOHu1T4KPKJSAf6y1VHi43eWaYe8Tx+J+o4R8Wki8gpeQUGlQz04qZoPllysLbqetDVXTMmMbQdostgG8Og==

"@ngspot/expandable-input@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@ngspot/expandable-input/-/expandable-input-3.0.0.tgz#b92e4b3e21f65093f7067f5ad76920880d0c5bd0"
integrity sha512-G6YUSpHGW2YguwK4sgOvNn7963WFpHB6+YAqNIOitmsSHDjfdch/2GK4mH2E2a0M+Yel+nfjo+PGF2G+uJ6HXQ==
"@ngspot/expandable-input@^3.0.1":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@ngspot/expandable-input/-/expandable-input-3.0.1.tgz#93703d316a813ad453b89c2337c91a0ae6cec0bb"
integrity sha512-HLJ00+F/LGPHZbBFAJAnWPiRlUTvAmRaBfvkJHTFi6iarX8QhnGP5/kB6AUucuHiNu0K1U97opPaofboClA1CQ==
dependencies:
tslib "^2.3.0"

Expand Down

0 comments on commit 305555b

Please sign in to comment.