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.

Sign up for GitHub

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

Jump to bottom

fix(core): Hint fix change detection when changing content programmatically #9291

Merged
merged 3 commits into from
Oct 4, 2024
Merged

fix(core): Hint fix change detection when changing content programmatically #9291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a21c78d
fix(core): `Hint` fix change detection when changing content programm…
waterplea Oct 1, 2024
a9fe0e7
chore: apply changes after linting [bot]
taiga-family-bot Oct 1, 2024
d6efa12
chore: fix
waterplea Oct 2, 2024
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 projects/core/directives/hint/hint-unstyled.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ export class TuiHintUnstyled<C> {
const hint = inject(TuiHintDirective<C>);

hint.component = new PolymorpheusComponent(TuiHintUnstyledComponent);
hint.content = inject(TemplateRef<C>);
hint.content.set(inject(TemplateRef<C>));
}
}
16 changes: 7 additions & 9 deletions projects/core/directives/hint/hint.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
import {ChangeDetectionStrategy, Component, inject, signal} from '@angular/core';
import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
import {EMPTY_CLIENT_RECT} from '@taiga-ui/cdk/constants';
import {TuiHoveredService} from '@taiga-ui/cdk/directives/hovered';
Expand All @@ -15,7 +15,6 @@ import {
import {TuiPositionService, TuiVisualViewportService} from '@taiga-ui/core/services';
import {TUI_ANIMATIONS_SPEED, TUI_VIEWPORT} from '@taiga-ui/core/tokens';
import {tuiIsObscured, tuiToAnimationOptions} from '@taiga-ui/core/utils';
import type {PolymorpheusContent} from '@taiga-ui/polymorpheus';
import {injectContext, PolymorpheusOutlet} from '@taiga-ui/polymorpheus';
import {map, takeWhile} from 'rxjs';

Expand All @@ -41,7 +40,7 @@ export const TUI_HINT_PROVIDERS = [
template: `
<ng-content />
<span
*polymorpheusOutlet="content as text; context: hint.context"
*polymorpheusOutlet="content() as text; context: hint.context"
[innerHTML]="text"
></span>
`,
Expand Down Expand Up @@ -69,6 +68,11 @@ export class TuiHintComponent<C = any> {

protected readonly hint = injectContext<TuiContext<TuiHintDirective<C>>>().$implicit;

protected readonly content =
this.hint.component.component === TuiHintUnstyledComponent
? signal('')
: this.hint.content;

protected readonly appearance =
this.hint.appearance ||
this.hint.el.closest('[tuiTheme]')?.getAttribute('tuiTheme');
Expand All @@ -90,12 +94,6 @@ export class TuiHintComponent<C = any> {
.subscribe((hover) => this.hover.toggle(hover));
}

protected get content(): PolymorpheusContent<C> {
return this.hint.component.component === TuiHintUnstyledComponent
? ''
: this.hint.content;
}

protected onClick(target: HTMLElement): void {
if (
(!target.closest('tui-hint') && !this.hint.el.contains(target)) ||
Expand Down
8 changes: 4 additions & 4 deletions projects/core/directives/hint/hint.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type {OnDestroy} from '@angular/core';
import {Directive, inject, INJECTOR, Input} from '@angular/core';
import {Directive, inject, INJECTOR, Input, signal} from '@angular/core';
import {TuiActiveZone} from '@taiga-ui/cdk/directives/active-zone';
import {tuiInjectElement} from '@taiga-ui/cdk/utils/dom';
import type {TuiRectAccessor, TuiVehicle} from '@taiga-ui/core/classes';
Expand Down Expand Up @@ -50,15 +50,15 @@ export class TuiHintDirective<C>
@Input('tuiHintAppearance')
public appearance = inject(TUI_HINT_OPTIONS).appearance;

public content: PolymorpheusContent<C>;
public content = signal<PolymorpheusContent<C>>(null);
public component = inject(PolymorpheusComponent<unknown>);
public readonly el = tuiInjectElement();
public readonly activeZone? = inject(TuiActiveZone, {optional: true});
public readonly type = 'hint';

@Input()
public set tuiHint(content: PolymorpheusContent<C>) {
this.content = content;
this.content.set(content);

if (!content) {
this.toggle(false);
Expand All @@ -74,7 +74,7 @@ export class TuiHintDirective<C>
}

public toggle(show: boolean): void {
if (show && this.content) {
if (show && this.content()) {
this.service.add(this);
} else {
this.service.remove(this);
Expand Down
2 changes: 1 addition & 1 deletion projects/kit/components/line-clamp/line-clamp-box.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {PolymorpheusOutlet, PolymorpheusTemplate} from '@taiga-ui/polymorpheus';
standalone: true,
imports: [PolymorpheusOutlet, PolymorpheusTemplate],
template: `
<ng-container *polymorpheusOutlet="content as text">{{ text }}</ng-container>
<ng-container *polymorpheusOutlet="content() as text">{{ text }}</ng-container>
`,
styleUrls: ['./line-clamp-box.style.less'],
changeDetection: ChangeDetectionStrategy.OnPush,
Expand Down
Loading