@aurelia/runtime-html
Advanced tools
Comparing version 2.1.0-dev.202303091738 to 2.1.0-dev.202303150804
@@ -56,3 +56,3 @@ export { bindable, Bindable, BindableDefinition, type PartialBindableDefinition, coercer, } from './bindable'; | ||
export { type PartialChildrenDefinition, ChildrenDefinition, Children, children, ChildrenObserver, } from './templating/children'; | ||
export { Controller, isCustomElementController, isCustomElementViewModel, ViewModelKind, HooksDefinition, State, LifecycleFlags, type ControllerVisitor, type IViewModel, IController, type IComponentController, type IContextualCustomElementController, type IControllerElementHydrationInstruction, type IHydratableController, IHydrationContext, type IDryCustomElementController, type ICustomAttributeController, type IHydratedController, type IHydratedComponentController, type IHydratedParentController, type ICompiledCustomElementController, type ICustomElementController, type ICustomElementViewModel, type ICustomAttributeViewModel, type IHydratedCustomElementViewModel, type IHydratedCustomAttributeViewModel, type ISyntheticView, } from './templating/controller'; | ||
export { Controller, isCustomElementController, isCustomElementViewModel, ViewModelKind, HooksDefinition, State, type ControllerVisitor, type IViewModel, IController, type IComponentController, type IContextualCustomElementController, type IControllerElementHydrationInstruction, type IHydratableController, IHydrationContext, type IDryCustomElementController, type ICustomAttributeController, type IHydratedController, type IHydratedComponentController, type IHydratedParentController, type ICompiledCustomElementController, type ICustomElementController, type ICustomElementViewModel, type ICustomAttributeViewModel, type IHydratedCustomElementViewModel, type IHydratedCustomAttributeViewModel, type ISyntheticView, } from './templating/controller'; | ||
export { ILifecycleHooks, LifecycleHooksEntry, LifecycleHooksDefinition, type LifecycleHooksLookup, type LifecycleHook, LifecycleHooks, lifecycleHooks, } from './templating/lifecycle-hooks'; | ||
@@ -59,0 +59,0 @@ export { IRendering, Rendering, } from './templating/rendering'; |
@@ -5,3 +5,3 @@ import { Constructable, IContainer } from '@aurelia/kernel'; | ||
import { HydrateElementInstruction } from '../../renderer'; | ||
import { LifecycleFlags, ICustomElementController, IHydratedController, ISyntheticView } from '../../templating/controller'; | ||
import { ICustomElementController, IHydratedController, ISyntheticView } from '../../templating/controller'; | ||
/** | ||
@@ -39,3 +39,3 @@ * An optional interface describing the dialog activate convention. | ||
/** @internal */ _platform: IPlatform, instruction: HydrateElementInstruction, contextFactory: CompositionContextFactory); | ||
attaching(initiator: IHydratedController, _parent: IHydratedController, _flags: LifecycleFlags): void | Promise<void>; | ||
attaching(initiator: IHydratedController, _parent: IHydratedController): void | Promise<void>; | ||
detaching(initiator: IHydratedController): void | Promise<void>; | ||
@@ -42,0 +42,0 @@ } |
import { IRenderLocation } from '../../dom'; | ||
import { IHydrationContext } from '../../templating/controller'; | ||
import { IRendering } from '../../templating/rendering'; | ||
import type { LifecycleFlags, ControllerVisitor, ICustomElementController, ICustomElementViewModel, IHydratedController, IHydratedParentController, ISyntheticView } from '../../templating/controller'; | ||
import type { ControllerVisitor, ICustomElementController, ICustomElementViewModel, IHydratedController, IHydratedParentController, ISyntheticView } from '../../templating/controller'; | ||
import type { HydrateElementInstruction } from '../../renderer'; | ||
@@ -11,5 +11,5 @@ export declare class AuSlot implements ICustomElementViewModel { | ||
constructor(location: IRenderLocation, instruction: HydrateElementInstruction, hdrContext: IHydrationContext, rendering: IRendering); | ||
binding(_initiator: IHydratedController, _parent: IHydratedParentController, _flags: LifecycleFlags): void | Promise<void>; | ||
attaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
binding(_initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
attaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
exposeChanged(v: object): void; | ||
@@ -16,0 +16,0 @@ dispose(): void; |
import { IRenderLocation } from '../../dom'; | ||
import { IViewFactory } from '../../templating/view'; | ||
import type { LifecycleFlags, ISyntheticView, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ControllerVisitor, IHydratableController } from '../../templating/controller'; | ||
import type { ISyntheticView, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ControllerVisitor, IHydratableController } from '../../templating/controller'; | ||
import type { IInstruction } from '../../renderer'; | ||
@@ -19,5 +19,5 @@ import type { INode } from '../../dom'; | ||
constructor(ifFactory: IViewFactory, location: IRenderLocation); | ||
attaching(initiator: IHydratedController, parent: IHydratedController, f: LifecycleFlags): void | Promise<void>; | ||
detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
valueChanged(newValue: unknown, oldValue: unknown, f: LifecycleFlags): void | Promise<void>; | ||
attaching(initiator: IHydratedController, _parent: IHydratedController): void | Promise<void>; | ||
detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
valueChanged(newValue: unknown, oldValue: unknown): void | Promise<void>; | ||
dispose(): void; | ||
@@ -24,0 +24,0 @@ accept(visitor: ControllerVisitor): void | true; |
import { IRenderLocation } from '../../dom'; | ||
import { IPlatform } from '../../platform'; | ||
import { IViewFactory } from '../../templating/view'; | ||
import type { LifecycleFlags, ControllerVisitor, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ISyntheticView } from '../../templating/controller'; | ||
import type { ControllerVisitor, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, ISyntheticView } from '../../templating/controller'; | ||
export type PortalTarget = string | Element | null | undefined; | ||
@@ -21,4 +21,4 @@ export type PortalLifecycleCallback = (target: PortalTarget, view: ISyntheticView) => void | Promise<void>; | ||
constructor(factory: IViewFactory, originalLoc: IRenderLocation, p: IPlatform); | ||
attaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
attaching(initiator: IHydratedController): void | Promise<void>; | ||
detaching(initiator: IHydratedController): void | Promise<void>; | ||
targetChanged(): void; | ||
@@ -25,0 +25,0 @@ positionChanged(): void; |
@@ -6,3 +6,3 @@ import { ILogger } from '@aurelia/kernel'; | ||
import { IInstruction } from '../../renderer'; | ||
import { LifecycleFlags, ICustomAttributeController, ICustomAttributeViewModel, IHydratableController, IHydratedController, IHydratedParentController, ISyntheticView } from '../../templating/controller'; | ||
import { ICustomAttributeController, ICustomAttributeViewModel, IHydratableController, IHydratedController, IHydratedParentController, ISyntheticView } from '../../templating/controller'; | ||
import { IViewFactory } from '../../templating/view'; | ||
@@ -26,6 +26,6 @@ import { AttrSyntax } from '../attribute-pattern'; | ||
link(_controller: IHydratableController, _childController: ICustomAttributeController, _target: INode, _instruction: IInstruction): void; | ||
attaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
valueChanged(_newValue: boolean, _oldValue: boolean, flags: LifecycleFlags): void; | ||
attaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
valueChanged(_newValue: boolean, _oldValue: boolean): void; | ||
private swap; | ||
detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
dispose(): void; | ||
@@ -41,5 +41,5 @@ } | ||
link(controller: IHydratableController, _childController: ICustomAttributeController, _target: INode, _instruction: IInstruction): void; | ||
activate(initiator: IHydratedController | null, flags: LifecycleFlags, scope: Scope): void | Promise<void>; | ||
deactivate(initiator: IHydratedController | null, flags: LifecycleFlags): void | Promise<void>; | ||
detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
activate(initiator: IHydratedController | null, scope: Scope): void | Promise<void>; | ||
deactivate(_initiator: IHydratedController | null): void | Promise<void>; | ||
detaching(initiator: IHydratedController): void | Promise<void>; | ||
dispose(): void; | ||
@@ -55,5 +55,5 @@ } | ||
link(controller: IHydratableController, _childController: ICustomAttributeController, _target: INode, _instruction: IInstruction): void; | ||
activate(initiator: IHydratedController | null, flags: LifecycleFlags, scope: Scope, resolvedValue: unknown): void | Promise<void>; | ||
deactivate(initiator: IHydratedController | null, flags: LifecycleFlags): void | Promise<void>; | ||
detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
activate(initiator: IHydratedController | null, scope: Scope, resolvedValue: unknown): void | Promise<void>; | ||
deactivate(_initiator: IHydratedController | null): void | Promise<void>; | ||
detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
dispose(): void; | ||
@@ -69,5 +69,5 @@ } | ||
link(controller: IHydratableController, _childController: ICustomAttributeController, _target: INode, _instruction: IInstruction): void; | ||
activate(initiator: IHydratedController | null, flags: LifecycleFlags, scope: Scope, error: unknown): void | Promise<void>; | ||
deactivate(initiator: IHydratedController | null, flags: LifecycleFlags): void | Promise<void>; | ||
detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
activate(initiator: IHydratedController | null, scope: Scope, error: unknown): void | Promise<void>; | ||
deactivate(_initiator: IHydratedController | null): void | Promise<void>; | ||
detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
dispose(): void; | ||
@@ -74,0 +74,0 @@ } |
@@ -5,3 +5,3 @@ import { type Collection, ForOfStatement, type IndexMap, type IsBindingBehavior, IExpressionParser } from '@aurelia/runtime'; | ||
import { HydrateTemplateController } from '../../renderer'; | ||
import type { LifecycleFlags, ISyntheticView, ICustomAttributeController, IHydratableController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ControllerVisitor } from '../../templating/controller'; | ||
import type { ISyntheticView, ICustomAttributeController, IHydratableController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ControllerVisitor } from '../../templating/controller'; | ||
type Items<C extends Collection = unknown[]> = C | undefined; | ||
@@ -16,6 +16,6 @@ export declare class Repeat<C extends Collection = unknown[]> implements ICustomAttributeViewModel { | ||
constructor(instruction: HydrateTemplateController, parser: IExpressionParser, location: IRenderLocation, parent: IHydratableController, factory: IViewFactory); | ||
binding(_initiator: IHydratedController, _parent: IHydratedParentController, _flags: LifecycleFlags): void | Promise<void>; | ||
attaching(initiator: IHydratedController, _parent: IHydratedParentController, _flags: LifecycleFlags): void | Promise<void>; | ||
detaching(initiator: IHydratedController, _parent: IHydratedParentController, _flags: LifecycleFlags): void | Promise<void>; | ||
unbinding(_initiator: IHydratedController, _parent: IHydratedParentController, _flags: LifecycleFlags): void | Promise<void>; | ||
binding(_initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
attaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
unbinding(_initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
itemsChanged(): void; | ||
@@ -22,0 +22,0 @@ handleCollectionChange(collection: Collection, indexMap: IndexMap | undefined): void; |
@@ -5,3 +5,3 @@ import { ILogger } from '@aurelia/kernel'; | ||
import { IViewFactory } from '../../templating/view'; | ||
import type { LifecycleFlags, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, IHydratableController, ISyntheticView, ControllerVisitor } from '../../templating/controller'; | ||
import type { ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, IHydratableController, ISyntheticView, ControllerVisitor } from '../../templating/controller'; | ||
import type { INode } from '../../dom'; | ||
@@ -23,4 +23,4 @@ import type { IInstruction } from '../../renderer'; | ||
link(_controller: IHydratableController, _childController: ICustomAttributeController, _target: INode, _instruction: IInstruction): void; | ||
attaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
attaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
dispose(): void; | ||
@@ -44,8 +44,8 @@ valueChanged(_newValue: boolean, _oldValue: boolean): void; | ||
link(controller: IHydratableController, _childController: ICustomAttributeController, _target: INode, _instruction: IInstruction): void; | ||
detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
isMatch(value: unknown): boolean; | ||
valueChanged(newValue: unknown, _oldValue: unknown): void; | ||
handleCollectionChange(): void; | ||
activate(initiator: IHydratedController | null, flags: LifecycleFlags, scope: Scope): void | Promise<void>; | ||
deactivate(initiator: IHydratedController | null, flags: LifecycleFlags): void | Promise<void>; | ||
activate(initiator: IHydratedController | null, scope: Scope): void | Promise<void>; | ||
deactivate(initiator: IHydratedController | null): void | Promise<void>; | ||
dispose(): void; | ||
@@ -52,0 +52,0 @@ protected linkToSwitch(auSwitch: Switch): void; |
import { IRenderLocation } from '../../dom'; | ||
import { IViewFactory } from '../../templating/view'; | ||
import type { ISyntheticView, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ControllerVisitor, LifecycleFlags } from '../../templating/controller'; | ||
import type { ISyntheticView, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ControllerVisitor } from '../../templating/controller'; | ||
export declare class With implements ICustomAttributeViewModel { | ||
@@ -9,5 +9,5 @@ view: ISyntheticView; | ||
constructor(factory: IViewFactory, location: IRenderLocation); | ||
valueChanged(newValue: unknown, _oldValue: unknown, _flags: LifecycleFlags): void; | ||
attaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void>; | ||
valueChanged(newValue: unknown, _oldValue: unknown): void; | ||
attaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void>; | ||
dispose(): void; | ||
@@ -14,0 +14,0 @@ accept(visitor: ControllerVisitor): void | true; |
@@ -14,8 +14,2 @@ import { Scope } from '@aurelia/runtime'; | ||
type BindingContext<C extends IViewModel> = Required<ICompileHooks> & Required<IActivationHooks<IHydratedController | null>> & C; | ||
export declare const enum LifecycleFlags { | ||
none = 0, | ||
fromBind = 1, | ||
fromUnbind = 2, | ||
dispose = 4 | ||
} | ||
export declare const enum MountTarget { | ||
@@ -65,3 +59,2 @@ none = 0, | ||
get hooks(): HooksDefinition; | ||
flags: LifecycleFlags; | ||
get viewModel(): BindingContext<C> | null; | ||
@@ -129,6 +122,5 @@ set viewModel(v: BindingContext<C> | null); | ||
private $initiator; | ||
private $flags; | ||
activate(initiator: IHydratedController, parent: IHydratedController | null, flags: LifecycleFlags, scope?: Scope | null): void | Promise<void>; | ||
activate(initiator: IHydratedController, parent: IHydratedController | null, scope?: Scope | null): void | Promise<void>; | ||
private bind; | ||
deactivate(initiator: IHydratedController, parent: IHydratedController | null, flags: LifecycleFlags): void | Promise<void>; | ||
deactivate(initiator: IHydratedController, _parent: IHydratedController | null): void | Promise<void>; | ||
private removeNodes; | ||
@@ -217,3 +209,2 @@ private unbind; | ||
readonly container: IContainer; | ||
readonly flags: LifecycleFlags; | ||
readonly vmKind: ViewModelKind; | ||
@@ -286,4 +277,4 @@ readonly definition: CustomElementDefinition | CustomAttributeDefinition | null; | ||
readonly nodes: INodeSequence; | ||
activate(initiator: IHydratedController, parent: IHydratedController, flags: LifecycleFlags, scope: Scope): void | Promise<void>; | ||
deactivate(initiator: IHydratedController, parent: IHydratedController, flags: LifecycleFlags): void | Promise<void>; | ||
activate(initiator: IHydratedController, parent: IHydratedController, scope: Scope): void | Promise<void>; | ||
deactivate(initiator: IHydratedController, parent: IHydratedController): void | Promise<void>; | ||
/** | ||
@@ -354,4 +345,4 @@ * Lock this view's scope to the provided `Scope`. The scope, which is normally set during `activate()`, will then not change anymore. | ||
readonly bindings: null; | ||
activate(initiator: IHydratedController, parent: IHydratedController, flags: LifecycleFlags, scope: Scope): void | Promise<void>; | ||
deactivate(initiator: IHydratedController, parent: IHydratedController, flags: LifecycleFlags): void | Promise<void>; | ||
activate(initiator: IHydratedController, parent: IHydratedController, scope: Scope): void | Promise<void>; | ||
deactivate(initiator: IHydratedController, parent: IHydratedController): void | Promise<void>; | ||
} | ||
@@ -419,4 +410,4 @@ /** | ||
readonly lifecycleHooks: LifecycleHooksLookup; | ||
activate(initiator: IHydratedController, parent: IHydratedController | null, flags: LifecycleFlags, scope?: Scope): void | Promise<void>; | ||
deactivate(initiator: IHydratedController, parent: IHydratedController | null, flags: LifecycleFlags): void | Promise<void>; | ||
activate(initiator: IHydratedController, parent: IHydratedController | null, scope?: Scope): void | Promise<void>; | ||
deactivate(initiator: IHydratedController, parent: IHydratedController | null): void | Promise<void>; | ||
} | ||
@@ -434,8 +425,8 @@ export declare const IController: import("@aurelia/kernel").InterfaceSymbol<IController<IViewModel>>; | ||
export interface IActivationHooks<TParent> { | ||
binding?(initiator: IHydratedController, parent: TParent, flags: LifecycleFlags): void | Promise<void>; | ||
bound?(initiator: IHydratedController, parent: TParent, flags: LifecycleFlags): void | Promise<void>; | ||
attaching?(initiator: IHydratedController, parent: TParent, flags: LifecycleFlags): void | Promise<void>; | ||
attached?(initiator: IHydratedController, flags: LifecycleFlags): void | Promise<void>; | ||
detaching?(initiator: IHydratedController, parent: TParent, flags: LifecycleFlags): void | Promise<void>; | ||
unbinding?(initiator: IHydratedController, parent: TParent, flags: LifecycleFlags): void | Promise<void>; | ||
binding?(initiator: IHydratedController, parent: TParent): void | Promise<void>; | ||
bound?(initiator: IHydratedController, parent: TParent): void | Promise<void>; | ||
attaching?(initiator: IHydratedController, parent: TParent): void | Promise<void>; | ||
attached?(initiator: IHydratedController): void | Promise<void>; | ||
detaching?(initiator: IHydratedController, parent: TParent): void | Promise<void>; | ||
unbinding?(initiator: IHydratedController, parent: TParent): void | Promise<void>; | ||
dispose?(): void; | ||
@@ -442,0 +433,0 @@ /** |
{ | ||
"name": "@aurelia/runtime-html", | ||
"version": "2.1.0-dev.202303091738", | ||
"version": "2.1.0-dev.202303150804", | ||
"main": "dist/cjs/index.cjs", | ||
@@ -52,7 +52,7 @@ "module": "dist/esm/index.mjs", | ||
"dependencies": { | ||
"@aurelia/kernel": "2.1.0-dev.202303091738", | ||
"@aurelia/metadata": "2.1.0-dev.202303091738", | ||
"@aurelia/platform": "2.1.0-dev.202303091738", | ||
"@aurelia/platform-browser": "2.1.0-dev.202303091738", | ||
"@aurelia/runtime": "2.1.0-dev.202303091738" | ||
"@aurelia/kernel": "2.1.0-dev.202303150804", | ||
"@aurelia/metadata": "2.1.0-dev.202303150804", | ||
"@aurelia/platform": "2.1.0-dev.202303150804", | ||
"@aurelia/platform-browser": "2.1.0-dev.202303150804", | ||
"@aurelia/runtime": "2.1.0-dev.202303150804" | ||
}, | ||
@@ -59,0 +59,0 @@ "devDependencies": { |
@@ -5,3 +5,3 @@ import { InstanceProvider, onResolve, resolveAll } from '@aurelia/kernel'; | ||
import { isElementType } from './resources/custom-element'; | ||
import { LifecycleFlags, Controller, IControllerElementHydrationInstruction } from './templating/controller'; | ||
import { Controller, IControllerElementHydrationInstruction } from './templating/controller'; | ||
import { createInterface, registerResolver } from './utilities-di'; | ||
@@ -81,3 +81,3 @@ | ||
return onResolve(this._runAppTasks('activating'), () => { | ||
return onResolve(this.controller.activate(this.controller, null, LifecycleFlags.fromBind, void 0), () => { | ||
return onResolve(this.controller.activate(this.controller, null, void 0), () => { | ||
return this._runAppTasks('activated'); | ||
@@ -91,3 +91,3 @@ }); | ||
return onResolve(this._runAppTasks('deactivating'), () => { | ||
return onResolve(this.controller.deactivate(this.controller, null, LifecycleFlags.none), () => { | ||
return onResolve(this.controller.deactivate(this.controller, null), () => { | ||
return this._runAppTasks('deactivated'); | ||
@@ -94,0 +94,0 @@ }); |
@@ -7,3 +7,3 @@ import { DI, InstanceProvider, onResolve } from '@aurelia/kernel'; | ||
import { CustomElementDefinition, generateElementName } from './resources/custom-element'; | ||
import { LifecycleFlags, Controller, ICustomElementController, ICustomElementViewModel, IHydratedParentController } from './templating/controller'; | ||
import { Controller, ICustomElementController, ICustomElementViewModel, IHydratedParentController } from './templating/controller'; | ||
import { createError, isFunction, isPromise } from './utilities'; | ||
@@ -115,3 +115,3 @@ import { createInterface, instanceRegistration, registerResolver } from './utilities-di'; | ||
return onResolve( | ||
view.activate(view, parentController, LifecycleFlags.fromBind), | ||
view.activate(view, parentController), | ||
() => view | ||
@@ -118,0 +118,0 @@ ); |
@@ -440,3 +440,3 @@ import { | ||
// be removed when this binding is unbound? | ||
// this.updateTarget('', flags); | ||
// this.updateTarget(''); | ||
this._scope = void 0; | ||
@@ -443,0 +443,0 @@ this.obs.clearAll(); |
@@ -404,3 +404,2 @@ export { | ||
State, | ||
LifecycleFlags, | ||
type ControllerVisitor, | ||
@@ -407,0 +406,0 @@ type IViewModel, |
@@ -7,3 +7,3 @@ import { Constructable, IContainer, InstanceProvider, onResolve, transient } from '@aurelia/kernel'; | ||
import { HydrateElementInstruction, IInstruction } from '../../renderer'; | ||
import { LifecycleFlags, Controller, IController, ICustomElementController, IHydratedController, ISyntheticView } from '../../templating/controller'; | ||
import { Controller, IController, ICustomElementController, IHydratedController, ISyntheticView } from '../../templating/controller'; | ||
import { IRendering } from '../../templating/rendering'; | ||
@@ -106,3 +106,3 @@ import { createError, isFunction, isPromise } from '../../utilities'; | ||
public attaching(initiator: IHydratedController, _parent: IHydratedController, _flags: LifecycleFlags): void | Promise<void> { | ||
public attaching(initiator: IHydratedController, _parent: IHydratedController): void | Promise<void> { | ||
return this._pending = onResolve( | ||
@@ -171,3 +171,3 @@ this.queue(new ChangeInfo(this.template, this.component, this.model, void 0), initiator), | ||
return onResolve( | ||
result.controller.deactivate(result.controller, this.$controller, LifecycleFlags.fromUnbind), | ||
result.controller.deactivate(result.controller, this.$controller), | ||
// todo: do we need to deactivate? | ||
@@ -247,6 +247,6 @@ () => { | ||
controller, | ||
(attachInitiator) => controller.activate(attachInitiator ?? controller, $controller, LifecycleFlags.fromBind, $controller.scope.parent!), | ||
(attachInitiator) => controller.activate(attachInitiator ?? controller, $controller, $controller.scope.parent!), | ||
// todo: call deactivate on the component component | ||
(deactachInitiator) => onResolve( | ||
controller.deactivate(deactachInitiator ?? controller, $controller, LifecycleFlags.fromUnbind), | ||
controller.deactivate(deactachInitiator ?? controller, $controller), | ||
removeCompositionHost | ||
@@ -281,7 +281,7 @@ ), | ||
controller, | ||
(attachInitiator) => controller.activate(attachInitiator ?? controller, $controller, LifecycleFlags.fromBind, scope), | ||
(attachInitiator) => controller.activate(attachInitiator ?? controller, $controller, scope), | ||
// todo: call deactivate on the component | ||
// a difference with composing custom element is that we leave render location/host alone | ||
// as they all share the same host/render location | ||
(detachInitiator) => controller.deactivate(detachInitiator ?? controller, $controller, LifecycleFlags.fromUnbind), | ||
(detachInitiator) => controller.deactivate(detachInitiator ?? controller, $controller), | ||
// casting is technically incorrect | ||
@@ -288,0 +288,0 @@ // but it's ignored in the caller anyway |
@@ -10,3 +10,3 @@ import { Scope } from '@aurelia/runtime'; | ||
import { IContainer, InstanceProvider, Writable } from '@aurelia/kernel'; | ||
import type { LifecycleFlags, ControllerVisitor, ICustomElementController, ICustomElementViewModel, IHydratedController, IHydratedParentController, ISyntheticView } from '../../templating/controller'; | ||
import type { ControllerVisitor, ICustomElementController, ICustomElementViewModel, IHydratedController, IHydratedParentController, ISyntheticView } from '../../templating/controller'; | ||
import type { IViewFactory } from '../../templating/view'; | ||
@@ -65,3 +65,2 @@ import type { HydrateElementInstruction } from '../../renderer'; | ||
_parent: IHydratedParentController, | ||
_flags: LifecycleFlags, | ||
): void | Promise<void> { | ||
@@ -84,4 +83,3 @@ this._parentScope = this.$controller.scope.parent!; | ||
initiator: IHydratedController, | ||
parent: IHydratedParentController, | ||
flags: LifecycleFlags, | ||
_parent: IHydratedParentController, | ||
): void | Promise<void> { | ||
@@ -91,3 +89,2 @@ return this.view.activate( | ||
this.$controller, | ||
flags, | ||
this._hasProjection ? this._outerScope! : this._parentScope!, | ||
@@ -99,6 +96,5 @@ ); | ||
initiator: IHydratedController, | ||
parent: IHydratedParentController, | ||
flags: LifecycleFlags, | ||
_parent: IHydratedParentController, | ||
): void | Promise<void> { | ||
return this.view.deactivate(initiator, this.$controller, flags); | ||
return this.view.deactivate(initiator, this.$controller); | ||
} | ||
@@ -105,0 +101,0 @@ |
@@ -8,3 +8,3 @@ /* eslint-disable @typescript-eslint/strict-boolean-expressions */ | ||
import type { LifecycleFlags, ISyntheticView, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ControllerVisitor, IHydratableController } from '../../templating/controller'; | ||
import type { ISyntheticView, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ControllerVisitor, IHydratableController } from '../../templating/controller'; | ||
import type { IInstruction } from '../../renderer'; | ||
@@ -46,3 +46,3 @@ import type { INode } from '../../dom'; | ||
public attaching(initiator: IHydratedController, parent: IHydratedController, f: LifecycleFlags): void | Promise<void> { | ||
public attaching(initiator: IHydratedController, _parent: IHydratedController): void | Promise<void> { | ||
let view: ISyntheticView | undefined; | ||
@@ -82,3 +82,3 @@ const ctrl = this.$controller; | ||
this.pending = onResolve( | ||
view.activate(initiator, ctrl, f, ctrl.scope), | ||
view.activate(initiator, ctrl, ctrl.scope), | ||
() => { | ||
@@ -94,3 +94,3 @@ if (isCurrent()) { | ||
public detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void> { | ||
public detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void> { | ||
this._wantsDeactivate = true; | ||
@@ -101,7 +101,7 @@ return onResolve(this.pending, () => { | ||
// Promise return values from user VM hooks are awaited by the initiator | ||
void this.view?.deactivate(initiator, this.$controller, flags); | ||
void this.view?.deactivate(initiator, this.$controller); | ||
}); | ||
} | ||
public valueChanged(newValue: unknown, oldValue: unknown, f: LifecycleFlags): void | Promise<void> { | ||
public valueChanged(newValue: unknown, oldValue: unknown): void | Promise<void> { | ||
if (!this.$controller.isActive) { | ||
@@ -132,3 +132,3 @@ return; | ||
() => this.pending = onResolve( | ||
currView?.deactivate(currView, ctrl, f), | ||
currView?.deactivate(currView, ctrl), | ||
() => { | ||
@@ -158,3 +158,3 @@ if (!isCurrent()) { | ||
return onResolve( | ||
view.activate(view, ctrl, f, ctrl.scope), | ||
view.activate(view, ctrl, ctrl.scope), | ||
() => { | ||
@@ -161,0 +161,0 @@ if (isCurrent()) { |
@@ -9,3 +9,3 @@ import { onResolve } from '@aurelia/kernel'; | ||
import { createLocation, insertManyBefore } from '../../utilities-dom'; | ||
import type { LifecycleFlags, ControllerVisitor, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ISyntheticView } from '../../templating/controller'; | ||
import type { ControllerVisitor, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, ISyntheticView } from '../../templating/controller'; | ||
@@ -73,4 +73,2 @@ export type PortalTarget = string | Element | null | undefined; | ||
initiator: IHydratedController, | ||
parent: IHydratedParentController, | ||
flags: LifecycleFlags, | ||
): void | Promise<void> { | ||
@@ -83,3 +81,3 @@ if (this.callbackContext == null) { | ||
return this._activating(initiator, newTarget, flags); | ||
return this._activating(initiator, newTarget); | ||
} | ||
@@ -89,6 +87,4 @@ | ||
initiator: IHydratedController, | ||
parent: IHydratedParentController, | ||
flags: LifecycleFlags, | ||
): void | Promise<void> { | ||
return this._deactivating(initiator, this._resolvedTarget, flags); | ||
return this._deactivating(initiator, this._resolvedTarget); | ||
} | ||
@@ -111,6 +107,6 @@ | ||
const ret = onResolve( | ||
this._deactivating(null, newTarget, $controller.flags), | ||
this._deactivating(null, newTarget), | ||
() => { | ||
this._moveLocation(newTarget, this.position); | ||
return this._activating(null, newTarget, $controller.flags); | ||
return this._activating(null, newTarget); | ||
}, | ||
@@ -128,6 +124,6 @@ ); | ||
const ret = onResolve( | ||
this._deactivating(null, _resolvedTarget, $controller.flags), | ||
this._deactivating(null, _resolvedTarget), | ||
() => { | ||
this._moveLocation(_resolvedTarget, this.position); | ||
return this._activating(null, _resolvedTarget, $controller.flags); | ||
return this._activating(null, _resolvedTarget); | ||
}, | ||
@@ -142,3 +138,2 @@ ); | ||
target: ResolvedTarget, | ||
flags: LifecycleFlags, | ||
): void | Promise<void> { | ||
@@ -152,3 +147,3 @@ const { activating, callbackContext, view } = this; | ||
() => { | ||
return this._activate(initiator, target, flags); | ||
return this._activate(initiator, target); | ||
}, | ||
@@ -162,3 +157,2 @@ ); | ||
target: ResolvedTarget, | ||
flags: LifecycleFlags, | ||
): void | Promise<void> { | ||
@@ -172,3 +166,3 @@ const { $controller, view } = this; | ||
return onResolve( | ||
view.activate(initiator ?? view, $controller, flags, $controller.scope), | ||
view.activate(initiator ?? view, $controller, $controller.scope), | ||
() => { | ||
@@ -196,3 +190,2 @@ return this._activated(target); | ||
target: ResolvedTarget, | ||
flags: LifecycleFlags, | ||
): void | Promise<void> { | ||
@@ -204,3 +197,3 @@ const { deactivating, callbackContext, view } = this; | ||
() => { | ||
return this._deactivate(initiator, target, flags); | ||
return this._deactivate(initiator, target); | ||
}, | ||
@@ -214,3 +207,2 @@ ); | ||
target: ResolvedTarget, | ||
flags: LifecycleFlags, | ||
): void | Promise<void> { | ||
@@ -223,3 +215,3 @@ const { $controller, view } = this; | ||
return onResolve( | ||
view.deactivate(initiator, $controller, flags), | ||
view.deactivate(initiator, $controller), | ||
() => { | ||
@@ -226,0 +218,0 @@ return this._deactivated(target); |
@@ -10,3 +10,2 @@ import { Task, TaskAbortError, TaskStatus } from '@aurelia/platform'; | ||
import { | ||
LifecycleFlags, | ||
Controller, | ||
@@ -61,3 +60,3 @@ ICustomAttributeController, | ||
public attaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void> { | ||
public attaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void> { | ||
const view = this.view; | ||
@@ -67,13 +66,13 @@ const $controller = this.$controller; | ||
return onResolve( | ||
view.activate(initiator, $controller, flags, this.viewScope = Scope.fromParent($controller.scope, {})), | ||
() => this.swap(initiator, flags) | ||
view.activate(initiator, $controller, this.viewScope = Scope.fromParent($controller.scope, {})), | ||
() => this.swap(initiator) | ||
); | ||
} | ||
public valueChanged(_newValue: boolean, _oldValue: boolean, flags: LifecycleFlags): void { | ||
public valueChanged(_newValue: boolean, _oldValue: boolean): void { | ||
if (!this.$controller.isActive) { return; } | ||
this.swap(null, flags); | ||
this.swap(null); | ||
} | ||
private swap(initiator: IHydratedController | null, flags: LifecycleFlags): void { | ||
private swap(initiator: IHydratedController | null): void { | ||
const value = this.value; | ||
@@ -100,5 +99,5 @@ if (!isPromise(value)) { | ||
return resolveAll( | ||
fulfilled?.deactivate(initiator, flags), | ||
rejected?.deactivate(initiator, flags), | ||
pending?.activate(initiator, flags, s) | ||
fulfilled?.deactivate(initiator), | ||
rejected?.deactivate(initiator), | ||
pending?.activate(initiator, s) | ||
); | ||
@@ -115,5 +114,5 @@ }, defaultQueuingOptions)).result.catch((err) => { if (!(err instanceof TaskAbortError)) throw err; }), | ||
this.postSettlePromise = (this.postSettledTask = q.queueTask(() => resolveAll( | ||
pending?.deactivate(initiator, flags), | ||
rejected?.deactivate(initiator, flags), | ||
fulfilled?.activate(initiator, flags, s, data), | ||
pending?.deactivate(initiator), | ||
rejected?.deactivate(initiator), | ||
fulfilled?.activate(initiator, s, data), | ||
), defaultQueuingOptions)).result; | ||
@@ -135,5 +134,5 @@ }; | ||
this.postSettlePromise = (this.postSettledTask = q.queueTask(() => resolveAll( | ||
pending?.deactivate(initiator, flags), | ||
fulfilled?.deactivate(initiator, flags), | ||
rejected?.activate(initiator, flags, s, err), | ||
pending?.deactivate(initiator), | ||
fulfilled?.deactivate(initiator), | ||
rejected?.activate(initiator, s, err), | ||
), defaultQueuingOptions)).result; | ||
@@ -159,7 +158,7 @@ }; | ||
public detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void> { | ||
public detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void> { | ||
this.preSettledTask?.cancel(); | ||
this.postSettledTask?.cancel(); | ||
this.preSettledTask = this.postSettledTask = null; | ||
return this.view.deactivate(initiator, this.$controller, flags); | ||
return this.view.deactivate(initiator, this.$controller); | ||
} | ||
@@ -195,3 +194,3 @@ | ||
public activate(initiator: IHydratedController | null, flags: LifecycleFlags, scope: Scope): void | Promise<void> { | ||
public activate(initiator: IHydratedController | null, scope: Scope): void | Promise<void> { | ||
let view = this.view; | ||
@@ -202,13 +201,13 @@ if(view === void 0) { | ||
if (view.isActive) { return; } | ||
return view.activate(view, this.$controller, flags, scope); | ||
return view.activate(view, this.$controller, scope); | ||
} | ||
public deactivate(initiator: IHydratedController | null, flags: LifecycleFlags): void | Promise<void> { | ||
public deactivate(_initiator: IHydratedController | null): void | Promise<void> { | ||
const view = this.view; | ||
if (view === void 0 || !view.isActive) { return; } | ||
return view.deactivate(view, this.$controller, flags); | ||
return view.deactivate(view, this.$controller); | ||
} | ||
public detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void> { | ||
return this.deactivate(initiator, flags); | ||
public detaching(initiator: IHydratedController): void | Promise<void> { | ||
return this.deactivate(initiator); | ||
} | ||
@@ -244,3 +243,3 @@ | ||
public activate(initiator: IHydratedController | null, flags: LifecycleFlags, scope: Scope, resolvedValue: unknown): void | Promise<void> { | ||
public activate(initiator: IHydratedController | null, scope: Scope, resolvedValue: unknown): void | Promise<void> { | ||
this.value = resolvedValue; | ||
@@ -252,13 +251,13 @@ let view = this.view; | ||
if (view.isActive) { return; } | ||
return view.activate(view, this.$controller, flags, scope); | ||
return view.activate(view, this.$controller, scope); | ||
} | ||
public deactivate(initiator: IHydratedController | null, flags: LifecycleFlags): void | Promise<void> { | ||
public deactivate(_initiator: IHydratedController | null): void | Promise<void> { | ||
const view = this.view; | ||
if (view === void 0 || !view.isActive) { return; } | ||
return view.deactivate(view, this.$controller, flags); | ||
return view.deactivate(view, this.$controller); | ||
} | ||
public detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void> { | ||
return this.deactivate(initiator, flags); | ||
public detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void> { | ||
return this.deactivate(initiator); | ||
} | ||
@@ -294,3 +293,3 @@ | ||
public activate(initiator: IHydratedController | null, flags: LifecycleFlags, scope: Scope, error: unknown): void | Promise<void> { | ||
public activate(initiator: IHydratedController | null, scope: Scope, error: unknown): void | Promise<void> { | ||
this.value = error; | ||
@@ -302,13 +301,13 @@ let view = this.view; | ||
if (view.isActive) { return; } | ||
return view.activate(view, this.$controller, flags, scope); | ||
return view.activate(view, this.$controller, scope); | ||
} | ||
public deactivate(initiator: IHydratedController | null, flags: LifecycleFlags): void | Promise<void> { | ||
public deactivate(_initiator: IHydratedController | null): void | Promise<void> { | ||
const view = this.view; | ||
if (view === void 0 || !view.isActive) { return; } | ||
return view.deactivate(view, this.$controller, flags); | ||
return view.deactivate(view, this.$controller); | ||
} | ||
public detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void> { | ||
return this.deactivate(initiator, flags); | ||
public detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void> { | ||
return this.deactivate(initiator); | ||
} | ||
@@ -315,0 +314,0 @@ |
@@ -33,3 +33,3 @@ import { type IDisposable, onResolve, IIndexable } from '@aurelia/kernel'; | ||
import type { PropertyBinding } from '../../binding/property-binding'; | ||
import type { LifecycleFlags, ISyntheticView, ICustomAttributeController, IHydratableController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ControllerVisitor } from '../../templating/controller'; | ||
import type { ISyntheticView, ICustomAttributeController, IHydratableController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ControllerVisitor } from '../../templating/controller'; | ||
@@ -113,3 +113,2 @@ type Items<C extends Collection = unknown[]> = C | undefined; | ||
_parent: IHydratedParentController, | ||
_flags: LifecycleFlags, | ||
): void | Promise<void> { | ||
@@ -148,3 +147,2 @@ const bindings = this._parent.bindings as PropertyBinding[]; | ||
_parent: IHydratedParentController, | ||
_flags: LifecycleFlags, | ||
): void | Promise<void> { | ||
@@ -159,3 +157,2 @@ this._normalizeToArray(); | ||
_parent: IHydratedParentController, | ||
_flags: LifecycleFlags, | ||
): void | Promise<void> { | ||
@@ -170,3 +167,2 @@ this._refreshCollectionObserver(); | ||
_parent: IHydratedParentController, | ||
_flags: LifecycleFlags, | ||
): void | Promise<void> { | ||
@@ -462,3 +458,3 @@ this._scopeMap.clear(); | ||
ret = view.activate(initiator ?? view, $controller, 0, viewScope); | ||
ret = view.activate(initiator ?? view, $controller, viewScope); | ||
if (isPromise(ret)) { | ||
@@ -491,3 +487,3 @@ (promises ?? (promises = [])).push(ret); | ||
view.release(); | ||
ret = view.deactivate(initiator ?? view, $controller, 0); | ||
ret = view.deactivate(initiator ?? view, $controller); | ||
if (isPromise(ret)) { | ||
@@ -521,3 +517,3 @@ (promises ?? (promises = [])).push(ret); | ||
view.release(); | ||
ret = view.deactivate(view, $controller, 0); | ||
ret = view.deactivate(view, $controller); | ||
if (isPromise(ret)) { | ||
@@ -591,3 +587,3 @@ (promises ?? (promises = [])).push(ret); | ||
ret = view.activate(view, $controller, 0, viewScope); | ||
ret = view.activate(view, $controller, viewScope); | ||
if (isPromise(ret)) { | ||
@@ -594,0 +590,0 @@ (promises ?? (promises = [])).push(ret); |
@@ -21,3 +21,3 @@ import { | ||
import type { LifecycleFlags, Controller, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, IHydratableController, ISyntheticView, ControllerVisitor } from '../../templating/controller'; | ||
import type { Controller, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, IHydratableController, ISyntheticView, ControllerVisitor } from '../../templating/controller'; | ||
import type { INode } from '../../dom'; | ||
@@ -58,7 +58,7 @@ import type { IInstruction } from '../../renderer'; | ||
public attaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void> { | ||
public attaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void> { | ||
const view = this.view; | ||
const $controller = this.$controller; | ||
this.queue(() => view.activate(initiator, $controller, flags, $controller.scope)); | ||
this.queue(() => view.activate(initiator, $controller, $controller.scope)); | ||
this.queue(() => this.swap(initiator, this.value)); | ||
@@ -68,6 +68,6 @@ return this.promise; | ||
public detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void> { | ||
public detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void> { | ||
this.queue(() => { | ||
const view = this.view; | ||
return view.deactivate(initiator, this.$controller, flags); | ||
return view.deactivate(initiator, this.$controller); | ||
}); | ||
@@ -182,6 +182,6 @@ return this.promise; | ||
if (length === 1) { | ||
return cases[0].activate(initiator, 0, scope); | ||
return cases[0].activate(initiator, scope); | ||
} | ||
return resolveAll(...cases.map(($case) => $case.activate(initiator, 0, scope))); | ||
return resolveAll(...cases.map(($case) => $case.activate(initiator, scope))); | ||
} | ||
@@ -200,3 +200,3 @@ | ||
cases.length = 0; | ||
return firstCase.deactivate(initiator, 0); | ||
return firstCase.deactivate(initiator); | ||
} | ||
@@ -209,3 +209,3 @@ return; | ||
if (!newActiveCases.includes($case)) { | ||
acc.push($case.deactivate(initiator, 0)); | ||
acc.push($case.deactivate(initiator)); | ||
} | ||
@@ -300,4 +300,4 @@ return acc; | ||
public detaching(initiator: IHydratedController, parent: IHydratedParentController, flags: LifecycleFlags): void | Promise<void> { | ||
return this.deactivate(initiator, flags); | ||
public detaching(initiator: IHydratedController, _parent: IHydratedParentController): void | Promise<void> { | ||
return this.deactivate(initiator); | ||
} | ||
@@ -331,3 +331,3 @@ | ||
public activate(initiator: IHydratedController | null, flags: LifecycleFlags, scope: Scope): void | Promise<void> { | ||
public activate(initiator: IHydratedController | null, scope: Scope): void | Promise<void> { | ||
let view = this.view; | ||
@@ -338,9 +338,9 @@ if(view === void 0) { | ||
if (view.isActive) { return; } | ||
return view.activate(initiator ?? view, this.$controller, flags, scope); | ||
return view.activate(initiator ?? view, this.$controller, scope); | ||
} | ||
public deactivate(initiator: IHydratedController | null, flags: LifecycleFlags): void | Promise<void> { | ||
public deactivate(initiator: IHydratedController | null): void | Promise<void> { | ||
const view = this.view; | ||
if (view === void 0 || !view.isActive) { return; } | ||
return view.deactivate(initiator ?? view, this.$controller, flags); | ||
return view.deactivate(initiator ?? view, this.$controller); | ||
} | ||
@@ -347,0 +347,0 @@ |
@@ -6,3 +6,3 @@ import { Scope } from '@aurelia/runtime'; | ||
import { bindable } from '../../bindable'; | ||
import type { ISyntheticView, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ControllerVisitor, LifecycleFlags } from '../../templating/controller'; | ||
import type { ISyntheticView, ICustomAttributeController, ICustomAttributeViewModel, IHydratedController, IHydratedParentController, ControllerVisitor } from '../../templating/controller'; | ||
@@ -28,3 +28,2 @@ export class With implements ICustomAttributeViewModel { | ||
_oldValue: unknown, | ||
_flags: LifecycleFlags, | ||
): void { | ||
@@ -45,8 +44,7 @@ const $controller = this.$controller; | ||
initiator: IHydratedController, | ||
parent: IHydratedParentController, | ||
flags: LifecycleFlags, | ||
_parent: IHydratedParentController, | ||
): void | Promise<void> { | ||
const { $controller, value } = this; | ||
const scope = Scope.fromParent($controller.scope, value === void 0 ? {} : value); | ||
return this.view.activate(initiator, $controller, flags, scope); | ||
return this.view.activate(initiator, $controller, scope); | ||
} | ||
@@ -56,6 +54,5 @@ | ||
initiator: IHydratedController, | ||
parent: IHydratedParentController, | ||
flags: LifecycleFlags, | ||
_parent: IHydratedParentController, | ||
): void | Promise<void> { | ||
return this.view.deactivate(initiator, this.$controller, flags); | ||
return this.view.deactivate(initiator, this.$controller); | ||
} | ||
@@ -62,0 +59,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
3271256
65158
+ Added@aurelia/kernel@2.1.0-dev.202303150804(transitive)
+ Added@aurelia/metadata@2.1.0-dev.202303150804(transitive)
+ Added@aurelia/platform@2.1.0-dev.202303150804(transitive)
+ Added@aurelia/platform-browser@2.1.0-dev.202303150804(transitive)
+ Added@aurelia/runtime@2.1.0-dev.202303150804(transitive)
- Removed@aurelia/kernel@2.1.0-dev.202303091738(transitive)
- Removed@aurelia/metadata@2.1.0-dev.202303091738(transitive)
- Removed@aurelia/platform@2.1.0-dev.202303091738(transitive)
- Removed@aurelia/platform-browser@2.1.0-dev.202303091738(transitive)
- Removed@aurelia/runtime@2.1.0-dev.202303091738(transitive)