From 136ba78f0d8e3a0c2e1dc779d0e289aca7c2c9dd Mon Sep 17 00:00:00 2001 From: Tony Samperi Date: Tue, 16 Jan 2024 22:20:38 +0100 Subject: [PATCH] v17.0.3 * Disable ripple --- changelog.md | 3 +++ package.json | 6 +++--- projects/ngx-mat-timepicker/package.json | 2 +- .../ngx-mat-timepicker-face.component.scss | 7 +++++++ .../ngx-mat-timepicker-face.component.ts | 9 --------- .../ngx-mat-timepicker-active-minute.pipe.ts | 6 +++--- .../ngx-mat-timepicker-minutes-formatter.pipe.ts | 3 ++- .../src/lib/utils/ngx-mat-timepicker.utils.ts | 4 ++++ yarn.lock | 16 ++++++++-------- 9 files changed, 31 insertions(+), 25 deletions(-) diff --git a/changelog.md b/changelog.md index 1a10e74..a4447e0 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +#17.0.3 +* Remove ripple + #17.0.2 * Fix time not preserved in picker when "appendToInput" is true (fixes [#93](https://github.com/tonysamperi/ngx-mat-timepicker/issues/93)) diff --git a/package.json b/package.json index 20ec90f..2710217 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ngx-mat-timepicker-repo", - "version": "17.0.2", + "version": "17.0.3", "build": 0, "license": "MIT", "private": true, @@ -43,12 +43,12 @@ }, "dependencies": { "@angular/animations": "^17.0.0", - "@angular/cdk": "^17.0.0-next.7", + "@angular/cdk": "^17.0.4", "@angular/common": "^17.0.0", "@angular/compiler": "^17.0.0", "@angular/core": "^17.0.0", "@angular/forms": "^17.0.0", - "@angular/material": "^17.0.0", + "@angular/material": "^17.0.4", "@angular/platform-browser": "^17.0.0", "@angular/platform-browser-dynamic": "^17.0.0", "@angular/ssr": "^17.0.0", diff --git a/projects/ngx-mat-timepicker/package.json b/projects/ngx-mat-timepicker/package.json index b5fa159..c546814 100644 --- a/projects/ngx-mat-timepicker/package.json +++ b/projects/ngx-mat-timepicker/package.json @@ -1,6 +1,6 @@ { "name": "ngx-mat-timepicker", - "version": "17.0.2", + "version": "17.0.3", "license": "MIT", "description": "ngx-mat-timepicker is an Angular material 9+ extension to add time pickers!", "homepage": "https://tonysamperi.github.io/ngx-mat-timepicker", diff --git a/projects/ngx-mat-timepicker/src/lib/components/ngx-mat-timepicker-face/ngx-mat-timepicker-face.component.scss b/projects/ngx-mat-timepicker/src/lib/components/ngx-mat-timepicker-face/ngx-mat-timepicker-face.component.scss index d324003..3f0169b 100644 --- a/projects/ngx-mat-timepicker/src/lib/components/ngx-mat-timepicker-face/ngx-mat-timepicker-face.component.scss +++ b/projects/ngx-mat-timepicker/src/lib/components/ngx-mat-timepicker-face/ngx-mat-timepicker-face.component.scss @@ -2,6 +2,13 @@ ngx-mat-timepicker-face { [mat-mini-fab].mat-unthemed { --mdc-fab-container-color: transparent; + --mat-fab-hover-state-layer-opacity: 0; + box-shadow: none; + + .mat-mdc-button-persistent-ripple { + display: none; + } + &:disabled[disabled] { --mdc-fab-container-color: transparent; background-color: transparent; diff --git a/projects/ngx-mat-timepicker/src/lib/components/ngx-mat-timepicker-face/ngx-mat-timepicker-face.component.ts b/projects/ngx-mat-timepicker/src/lib/components/ngx-mat-timepicker-face/ngx-mat-timepicker-face.component.ts index 232dc36..e441081 100644 --- a/projects/ngx-mat-timepicker/src/lib/components/ngx-mat-timepicker-face/ngx-mat-timepicker-face.component.ts +++ b/projects/ngx-mat-timepicker/src/lib/components/ngx-mat-timepicker-face/ngx-mat-timepicker-face.component.ts @@ -84,24 +84,15 @@ export class NgxMatTimepickerFaceComponent implements AfterViewInit, OnChanges, @ViewChild("clockHand", {static: true, read: ElementRef}) clockHand: ElementRef; @Input() color: ThemePalette = "primary"; - @Input() faceTime: NgxMatTimepickerClockFace[]; - @Input() format: NgxMatTimepickerFormatType; - innerClockFaceSize = 85; isClockFaceDisabled: boolean; - @Input() minutesGap: number; - @Input() selectedTime: NgxMatTimepickerClockFace; - @Output() timeChange = new EventEmitter(); - @Output() timeSelected = new EventEmitter(); - timeUnit = NgxMatTimepickerUnits; - @Input() unit: NgxMatTimepickerUnits; private _isStarted: boolean; diff --git a/projects/ngx-mat-timepicker/src/lib/pipes/ngx-mat-timepicker-active-minute.pipe.ts b/projects/ngx-mat-timepicker/src/lib/pipes/ngx-mat-timepicker-active-minute.pipe.ts index 9900d2d..2f9794c 100644 --- a/projects/ngx-mat-timepicker/src/lib/pipes/ngx-mat-timepicker-active-minute.pipe.ts +++ b/projects/ngx-mat-timepicker/src/lib/pipes/ngx-mat-timepicker-active-minute.pipe.ts @@ -1,4 +1,5 @@ import {Pipe, PipeTransform} from "@angular/core"; +import {NgxMatTimepickerUtils} from "../utils/ngx-mat-timepicker.utils"; @Pipe({ name: "activeMinute", @@ -6,13 +7,12 @@ import {Pipe, PipeTransform} from "@angular/core"; }) export class NgxMatTimepickerActiveMinutePipe implements PipeTransform { - transform(minute: number, currentMinute: number, gap: number, isClockFaceDisabled: boolean): boolean { + transform(minute: number, currentMinute: number, gap: number | void, isClockFaceDisabled: boolean): boolean { if (minute == null || isClockFaceDisabled) { return false; } - const defaultGap = 5; - return ((currentMinute === minute) && (minute % (gap || defaultGap) === 0)); + return ((currentMinute === minute) && (minute % (gap || NgxMatTimepickerUtils.DEFAULT_MINUTES_GAP) === 0)); } } diff --git a/projects/ngx-mat-timepicker/src/lib/pipes/ngx-mat-timepicker-minutes-formatter.pipe.ts b/projects/ngx-mat-timepicker/src/lib/pipes/ngx-mat-timepicker-minutes-formatter.pipe.ts index 4f79752..eeee7b8 100644 --- a/projects/ngx-mat-timepicker/src/lib/pipes/ngx-mat-timepicker-minutes-formatter.pipe.ts +++ b/projects/ngx-mat-timepicker/src/lib/pipes/ngx-mat-timepicker-minutes-formatter.pipe.ts @@ -1,4 +1,5 @@ import {Pipe, PipeTransform} from "@angular/core"; +import {NgxMatTimepickerUtils} from "../utils/ngx-mat-timepicker.utils"; @Pipe({ name: "minutesFormatter", @@ -6,7 +7,7 @@ import {Pipe, PipeTransform} from "@angular/core"; }) export class NgxMatTimepickerMinutesFormatterPipe implements PipeTransform { - transform(minute: number, gap = 5): number | string { + transform(minute: number, gap = NgxMatTimepickerUtils.DEFAULT_MINUTES_GAP): number | string { if (!minute) { return minute; } diff --git a/projects/ngx-mat-timepicker/src/lib/utils/ngx-mat-timepicker.utils.ts b/projects/ngx-mat-timepicker/src/lib/utils/ngx-mat-timepicker.utils.ts index 5f8321e..b4a2187 100644 --- a/projects/ngx-mat-timepicker/src/lib/utils/ngx-mat-timepicker.utils.ts +++ b/projects/ngx-mat-timepicker/src/lib/utils/ngx-mat-timepicker.utils.ts @@ -8,6 +8,10 @@ import {DateTime} from "ts-luxon"; // @dynamic export class NgxMatTimepickerUtils { + static get DEFAULT_MINUTES_GAP(): number { + return 5; + } + static disableHours(hours: NgxMatTimepickerClockFace[], config: NgxMatTimepickerDisabledConfig): NgxMatTimepickerClockFace[] { if (config.min || config.max) { diff --git a/yarn.lock b/yarn.lock index a4efa08..f739951 100644 --- a/yarn.lock +++ b/yarn.lock @@ -129,10 +129,10 @@ dependencies: tslib "^2.3.0" -"@angular/cdk@^17.0.0-next.7": - version "17.0.0-next.7" - resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-17.0.0-next.7.tgz#5c21ac3d5870a6ac6263e5aaf55cb01e844fe305" - integrity sha512-nUsTpQJPVBmyQzLNvf28ZOLfsenwW0ubEVY0zjKFaY0OZZeevLQFomS4jOzKawsqEkIlK6OcDeFwY9mDjwDYsw== +"@angular/cdk@^17.0.4": + version "17.0.4" + resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-17.0.4.tgz#02ea9ae9b85d29b6eb1ac4c63a3fc175767b4d59" + integrity sha512-mh/EuIR0NPfpNqAXBSZWuJeBMXUvUDYdKhiFWZet5NLO1bDgFe1MGLBjtW4us95k4BZsMLbCKNxJgc+4JqwUvg== dependencies: tslib "^2.3.0" optionalDependencies: @@ -219,10 +219,10 @@ resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-17.0.0.tgz#8cdcf6bbc2cdb2ce351f937e39481c91372433f3" integrity sha512-53BU8lx2rgjmfsk4gEazgmzX2F/wcE3GEIg1gtZMpJQocGHk1wTO81FxZPTFPRP0dMrirJ6LMauvHlQOqQCDBA== -"@angular/material@^17.0.0": - version "17.0.0" - resolved "https://registry.yarnpkg.com/@angular/material/-/material-17.0.0.tgz#7c2b67ed5c34c70c27f3f65a13441178d4682b9f" - integrity sha512-rd7H7NhkDPDiyLHADm2FHOJlmgaWV7ZYNYPe/4yTXlt++GTSLhKus+PTCZYVsKGlA3mxDhNnC1RY+fdjtx/G2A== +"@angular/material@^17.0.4": + version "17.0.4" + resolved "https://registry.yarnpkg.com/@angular/material/-/material-17.0.4.tgz#d3d7b093ae09662f18b04a27cfccfab8f4182895" + integrity sha512-IKkys4EavE1TMHApPMbFLvJU4pP8S8XNfY2eS7/kFwW7eyTcz0zV/IKeBbxkpej19MaouozU+KWeRJtxHg6x8g== dependencies: "@material/animation" "15.0.0-canary.a246a4439.0" "@material/auto-init" "15.0.0-canary.a246a4439.0"