Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(components/calendar): scroll in to view in year/month pickers #760 #1198

Merged
merged 8 commits into from
Dec 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/beta-publish-ng14.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: 'Update beta versions'
run: npx nx generate @prizm-ui/nx-plugin:update-version --updateInDependencies true --newVersion="1.*.*-ng14beta.up" --all --currentVersion="${{ env.LAST_DRAFT_VERSION }}"

- name: 'Build beta versions'
- name: 'Build beta versions.'
run: npx nx run-many --target=build --all --parallel --max-parallel=3

- name: Save dist in cache...
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beta-publish-ng15.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: 'Update beta versions'
run: npx nx generate @prizm-ui/nx-plugin:update-version --updateInDependencies true --newVersion="2.*.*-ng15beta.up" --all --currentVersion="${{ env.LAST_DRAFT_VERSION }}"

- name: 'Build beta versions'
- name: 'Build beta versions.'
run: npx nx run-many --target=build --all --parallel --max-parallel=3

- name: Save dist in cache...
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beta-publish-ng16.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: 'Update beta versions'
run: npx nx generate @prizm-ui/nx-plugin:update-version --updateInDependencies true --newVersion="3.*.*-beta.up" --all --currentVersion="${{ env.LAST_DRAFT_VERSION }}"

- name: 'Build beta versions'
- name: 'Build beta versions.'
run: npx nx run-many --target=build --all --parallel --max-parallel=3

- name: Save dist in cache...
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/beta-released.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ env:
npmrc_config_push: ${{ secrets.NPMRC_CONFIG_PUSH }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_PUBLISH_TOKEN }}
jobs:
pre_beta_release_v1:
uses: zyfra/Prizm/.github/workflows/beta-publish-ng14.yml@main
pre_beta_release_v3:
if: ${{ always() }}
uses: zyfra/Prizm/.github/workflows/beta-publish-ng16.yml@main
secrets: inherit

pre_beta_release_v2:
needs: pre_beta_release_v1
needs: pre_beta_release_v3
if: ${{ always() }}
uses: zyfra/Prizm/.github/workflows/beta-publish-ng15.yml@main
secrets: inherit

pre_beta_release_v3:
pre_beta_release_v1:
needs: pre_beta_release_v2
if: ${{ always() }}
uses: zyfra/Prizm/.github/workflows/beta-publish-ng16.yml@main
uses: zyfra/Prizm/.github/workflows/beta-publish-ng14.yml@main
secrets: inherit
20 changes: 6 additions & 14 deletions .github/workflows/pre-released.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,19 @@ jobs:
# pre_beta_release_v3:
# uses: zyfra/Prizm/.github/workflows/beta-publish-ng16.yml@main
# secrets: inherit

pre_release_v1:
pre_release_v3:
if: ${{ always() }}
uses: zyfra/Prizm/.github/workflows/pre-release-publish-ng14.yml@main
uses: zyfra/Prizm/.github/workflows/pre-release-publish-ng16.yml@main
secrets: inherit
# needs: pre_beta_release_v1

pre_release_v2:
needs: pre_release_v1
needs: pre_release_v3
if: ${{ always() }}
uses: zyfra/Prizm/.github/workflows/pre-release-publish-ng15.yml@main
secrets: inherit
# needs: pre_beta_release_v2

pre_release_v3:
needs: pre_release_v2
pre_release_v1:
needs: pre_release_v1
if: ${{ always() }}
uses: zyfra/Prizm/.github/workflows/pre-release-publish-ng16.yml@main
uses: zyfra/Prizm/.github/workflows/pre-release-publish-ng14.yml@main
secrets: inherit
# needs: pre_beta_release_v3
# check_package_install:
# uses: zyfra/Prizm/.github/workflows/check-build-in-real-project-ng-15.yml@main
# secrets: inherit
# needs: pre_beta_release
13 changes: 6 additions & 7 deletions .github/workflows/released.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,18 @@ jobs:
# secrets: inherit
# needs: pre_beta_release

release_v1:
# needs: release_v1
uses: zyfra/Prizm/.github/workflows/main-publish-ng14.yml@main
release_v3:
if: ${{ always() }}
uses: zyfra/Prizm/.github/workflows/main-publish-ng16.yml@main
secrets: inherit

release_v2:
needs: release_v1
needs: release_v3
if: ${{ always() }}
uses: zyfra/Prizm/.github/workflows/main-publish-ng15.yml@main
secrets: inherit

release_v3:
release_v1:
needs: release_v2
if: ${{ always() }}
uses: zyfra/Prizm/.github/workflows/main-publish-ng16.yml@main
uses: zyfra/Prizm/.github/workflows/main-publish-ng14.yml@main
secrets: inherit
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ import { prizmI18nInitWithKey } from '../../services';
import { CommonModule } from '@angular/common';
import {
PrizmFocusableModule,
PrizmHoveredDirective,
PrizmHoveredModule,
PrizmPressedModule,
PrizmStopPropagationModule,
} from '../../directives';
import { PrizmPrimitiveSpinButtonModule, PrizmPrimitiveYearPickerModule } from '../internal';
import { PrizmScrollbarModule } from '../scrollbar';
import { PrizmLetModule } from '@prizm-ui/helpers';
import { PrizmPrimitiveSpinButtonModule, PrizmPrimitiveYearPickerComponent } from '../internal';
import { PrizmScrollbarComponent } from '../scrollbar';
import { PrizmLetDirective } from '@prizm-ui/helpers';

const TODAY = PrizmDay.currentLocal();

Expand All @@ -45,11 +46,11 @@ const TODAY = PrizmDay.currentLocal();
imports: [
CommonModule,
PrizmStopPropagationModule,
PrizmPrimitiveYearPickerModule,
PrizmPrimitiveYearPickerComponent,
PrizmPrimitiveSpinButtonModule,
PrizmScrollbarModule,
PrizmLetModule,
PrizmHoveredModule,
PrizmScrollbarComponent,
PrizmLetDirective,
PrizmHoveredDirective,
PrizmPressedModule,
PrizmFocusableModule,
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ import { PrizmBooleanHandler } from '../../../types/handler';
import { PRIZM_ALWAYS_FALSE_HANDLER } from '../../../constants/always-false-handler';
import { prizmInRange } from '../../../util/math/in-range';
import {
PrizmHoveredModule,
PrizmHoveredDirective,
PrizmInteractiveState,
PrizmPressedModule,
PrizmRepeatTimesModule,
PrizmScrollIntoViewModule,
PrizmPressedDirective,
PrizmRepeatTimesDirective,
PrizmScrollIntoViewDirective,
} from '../../../directives';
import { PrizmRangeState } from '../../../@core/enums/range-state';
import { prizmDefaultProp, prizmPure } from '@prizm-ui/core';
import { prizmI18nInitWithKey } from '../../../services/i18n.service';
import { PRIZM_MONTHS } from '../../../tokens/i18n';
import { PrizmAbstractTestId } from '../../../abstract/interactive';
import { PrizmLetDirective, PrizmLetModule } from '@prizm-ui/helpers';
import { PrizmLetDirective } from '@prizm-ui/helpers';
import { CommonModule } from '@angular/common';
import { PrizmMonthPipeModule } from '../../../pipes';

Expand All @@ -29,12 +29,12 @@ const ROWS = 4;
styleUrls: [`./primitive-month-picker.component.less`],
standalone: true,
imports: [
PrizmHoveredModule,
PrizmPressedModule,
PrizmRepeatTimesModule,
PrizmHoveredDirective,
PrizmPressedDirective,
PrizmRepeatTimesDirective,
PrizmLetDirective,
CommonModule,
PrizmScrollIntoViewModule,
PrizmScrollIntoViewDirective,
PrizmMonthPipeModule,
],
changeDetection: ChangeDetectionStrategy.OnPush,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { PRIZM_MONTHS } from '../../../tokens/i18n';
import { CommonModule } from '@angular/common';
import { PrizmFocusableModule } from '../../../directives';
import { PrizmPrimitiveSpinButtonModule } from '../primitive-spin-button';
import { PrizmLinkModule } from '../../link';
import { PrizmLinkComponent } from '../../link';
import { PrizmIconComponent } from '../../icon';
import { PrizmMonthPipeModule } from '../../../pipes';

Expand All @@ -24,7 +24,7 @@ import { PrizmMonthPipeModule } from '../../../pipes';
CommonModule,
PrizmFocusableModule,
PrizmPrimitiveSpinButtonModule,
PrizmLinkModule,
PrizmLinkComponent,
PrizmIconComponent,
PrizmMonthPipeModule,
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import { PrizmBooleanHandler } from '../../../types/handler';
import { PRIZM_ALWAYS_FALSE_HANDLER } from '../../../constants/always-false-handler';
import { prizmInRange } from '../../../util/math/in-range';
import {
PrizmHoveredModule,
PrizmHoveredDirective,
PrizmInteractiveState,
PrizmPressedModule,
PrizmRepeatTimesModule,
PrizmScrollIntoViewModule,
PrizmPressedDirective,
PrizmRepeatTimesDirective,
PrizmScrollIntoViewDirective,
} from '../../../directives';
import { PrizmRangeState } from '../../../@core/enums/range-state';
import { PrizmAbstractTestId } from '../../../abstract/interactive';
import { PrizmLetDirective, PrizmLetModule } from '@prizm-ui/helpers';
import { PrizmLetDirective } from '@prizm-ui/helpers';

const LIMIT = 100;
const ITEMS_IN_ROW = 3;
Expand All @@ -27,11 +27,11 @@ const ITEMS_IN_ROW = 3;
changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [
PrizmHoveredModule,
PrizmPressedModule,
PrizmRepeatTimesModule,
PrizmHoveredDirective,
PrizmPressedDirective,
PrizmRepeatTimesDirective,
PrizmLetDirective,
PrizmScrollIntoViewModule,
PrizmScrollIntoViewDirective,
],
})
export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import { NgModule } from '@angular/core';
import { PrizmPrimitiveYearPickerComponent } from './primitive-year-picker.component';
import { PrizmLetModule } from '@prizm-ui/helpers';
import { PrizmRepeatTimesModule } from '../../../directives/repeat-times/repeat-times.module';
import { PrizmHoveredModule } from '../../../directives/hovered/hovered.module';
import { PrizmPressedModule } from '../../../directives/pressed/pressed.module';
import { PrizmScrollIntoViewModule } from '../../../directives/scroll-into-view/scroll-into-view.module';

/**
* @deprecated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,20 @@ export class PrizmScrollbarComponent extends PrizmAbstractTestId {
return this.isLegacy && this.visibility === 'visible' && !this.delegated;
}

@HostListener(`${PRIZM_SCROLLABLE}.stop`, ['$event.detail'])
public onScrollable(element: HTMLElement): void {
@HostListener(`${PRIZM_SCROLLABLE}`, ['$event.detail'])
public onScrollable(element: HTMLElement, $event: Event): void {
this.delegated = true;
this.browserScrollRef.nativeElement = element;
}

@HostListener(`${PRIZM_SCROLL_INTO_VIEW}.stop`, ['$event.detail'])
public scrollIntoView(detail: HTMLElement): void {
@HostListener(`${PRIZM_SCROLL_INTO_VIEW}`, ['$event.detail', '$event'])
public scrollIntoView(detail: HTMLElement, event: Event): void {
if (this.delegated) {
return;
}

const { nativeElement } = this.browserScrollRef;
const { offsetTop, offsetLeft } = prizmGetElementOffset(nativeElement, detail);

nativeElement.scrollTop = offsetTop + detail.offsetHeight / 2 - nativeElement.clientHeight / 2;
nativeElement.scrollLeft = offsetLeft + detail.offsetWidth / 2 - nativeElement.clientWidth / 2;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { PrizmHoveredService } from '../../services/hovered.service';

@Directive({
selector: '[prizmHoveredChange]',
standalone: true,
})
export class PrizmHoveredDirective {
@Output()
Expand Down
6 changes: 5 additions & 1 deletion libs/components/src/lib/directives/hovered/hovered.module.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { NgModule } from '@angular/core';
import { PrizmHoveredDirective } from './hovered.directive';

/**
* @deprecated
* use standalone
* */
@NgModule({
declarations: [PrizmHoveredDirective],
imports: [PrizmHoveredDirective],
exports: [PrizmHoveredDirective],
})
export class PrizmHoveredModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { PRIZM_MUTATION_OBSERVER_OPTIONS, PrizmMutationObserveOptions } from './
@Directive({
selector: '[prizmMutationObserver]',
providers: [PrizmDestroyService],
standalone: true,
exportAs: 'prizmMutationObserverEl',
})
export class PrizmMutationObserveDirective implements OnInit {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { NgModule } from '@angular/core';
import { PrizmMutationObserveDirective } from './mutation-observer.directive';

/**
* @deprecated
* use standalone
* */
@NgModule({
declarations: [PrizmMutationObserveDirective],
imports: [PrizmMutationObserveDirective],
exports: [PrizmMutationObserveDirective],
})
export class PrizmMutationObserveModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { PrizmInputNativeValueNeedChange } from './model';
@Directive({
selector: `input[prizmInputNativeValue]`,
providers: [PrizmDestroyService],
standalone: true,
exportAs: 'prizmInputNativeValue',
})
export class PrizmInputNativeValueDirective<T = any> implements OnInit {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { NgModule } from '@angular/core';
import { PrizmInputNativeValueDirective } from './input-native-value.directive';

/**
* @deprecated
* use standalone
* */
@NgModule({
declarations: [PrizmInputNativeValueDirective],
imports: [PrizmInputNativeValueDirective],
exports: [PrizmInputNativeValueDirective],
})
export class PrizmInputNativeValueModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { takeUntil } from 'rxjs/operators';
@Directive({
selector: '[prizmOverscroll]',
providers: [PrizmDestroyService],
standalone: true,
})
export class PrizmOverscrollDirective implements OnInit {
@Input('prizmOverscroll')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { NgModule } from '@angular/core';
import { PrizmOverscrollDirective } from './overscroll.directive';

/**
* @deprecated
* use standalone
* */
@NgModule({
declarations: [PrizmOverscrollDirective],
imports: [PrizmOverscrollDirective],
exports: [PrizmOverscrollDirective],
})
export class PrizmOverscrollModule {}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ import { Directive, ElementRef, Inject, Output } from '@angular/core';
import { prizmPressedObservable } from '../../observables/pressed-observable';
import { PRIZM_TAKE_ONLY_TRUSTED_EVENTS } from '../../tokens/take-only-trusted-events';

/**
*
* */
Comment on lines +5 to +7
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/**
*
* */

@Directive({
selector: '[prizmPressedChange]',
standalone: true,
})
export class PrizmPressedDirective {
@Output()
Expand Down
6 changes: 5 additions & 1 deletion libs/components/src/lib/directives/pressed/pressed.module.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { NgModule } from '@angular/core';
import { PrizmPressedDirective } from './pressed.directive';

/**
* @deprecated
* use standalone
* */
@NgModule({
declarations: [PrizmPressedDirective],
imports: [PrizmPressedDirective],
exports: [PrizmPressedDirective],
})
export class PrizmPressedModule {}
Loading
Loading