@motifx/core 1.2.0-rc.4 → 1.2.0-rc.5

package/dist/chunks/{core-ZMoM1273.cjs → core-ZhqTS1zK.cjs}

@@ -1,5 +1,65 @@
 'use strict';
 
+const state = {
+    enabled: false,
+    listeners: new Set(),
+    warnings: [],
+    routes: null,
+    exposed: null,
+};
+/** Dev modu: devtools açık ya da `globalThis.__MOTIF_DEV__ === true`. */
+function isDevLike() {
+    return state.enabled || globalThis.__MOTIF_DEV__ === true;
+}
+function setDevtoolsEnabled(enabled) {
+    state.enabled = enabled;
+    try {
+        const g = globalThis;
+        if (enabled) {
+            state.exposed = { version: 1, on, getWarnings, getRoutes, isEnabled };
+            g.__MOTIF_DEVTOOLS__ = state.exposed;
+        }
+        else {
+            if (state.exposed !== null && g.__MOTIF_DEVTOOLS__ === state.exposed)
+                delete g.__MOTIF_DEVTOOLS__;
+            state.exposed = null;
+        }
+    }
+    catch { }
+}
+function isEnabled() { return state.enabled; }
+function devtools() {
+    return state.enabled ? emit : undefined;
+}
+function on(listener) {
+    state.listeners.add(listener);
+    return () => { state.listeners.delete(listener); };
+}
+function emit(type, payload) {
+    const ev = { type, payload };
+    for (const l of state.listeners) {
+        try {
+            l(ev);
+        }
+        catch { }
+    }
+}
+function warn(code, message, details) {
+    if (!isDevLike())
+        return;
+    const w = { code, message, details };
+    state.warnings.push(w);
+    try {
+        if (typeof console !== 'undefined')
+            details === undefined ? console.warn(`[motifjs] ${code}: ${message}`) : console.warn(`[motifjs] ${code}: ${message}`, details);
+    }
+    catch { }
+    devtools()?.('warning', w);
+}
+function getWarnings() { return state.warnings.slice(); }
+function setRoutes(routes) { state.routes = routes; }
+function getRoutes() { return state.routes; }
+
 function rethrowLater(error) {
     setTimeout(() => { throw error; }, 0);
 }
@@ -30,10 +90,7 @@ class ErrorHandler {
                 console.error(error.message);
         }
         try {
-            const bus = globalThis.__MOTIF_DEVTOOLS_BUS__;
-            if (bus && typeof bus.publish === 'function') {
-                bus.publish('error:caught', { context: error.code ?? error.name, error: this.serializeError(error) });
-            }
+            devtools()?.('error:caught', { context: error.code ?? error.name, error: this.serializeError(error) });
         }
         catch { /* ignore */ }
         this.emit(error);
@@ -43,10 +100,7 @@ class ErrorHandler {
             console.error(`[motifjs Error - ${context}]`, error);
         }
         try {
-            const bus = globalThis.__MOTIF_DEVTOOLS_BUS__;
-            if (bus && typeof bus.publish === 'function') {
-                bus.publish('error:caught', { context, error: this.serializeError(error) });
-            }
+            devtools()?.('error:caught', { context, error: this.serializeError(error) });
         }
         catch { /* ignore */ }
     }
@@ -176,90 +230,6 @@ function setUnexpectedErrorHandler(handler) {
     errorHandler.setUnexpectedErrorHandler(handler);
 }
 
-const state = {
-    enabled: false,
-    listeners: new Set(),
-    warnings: [],
-    routes: null,
-};
-/** Dev modu: devtools açık ya da `globalThis.__MOTIF_DEV__ === true`. */
-function isDevLike() {
-    return state.enabled || globalThis.__MOTIF_DEV__ === true;
-}
-function isRequestedByFlag() {
-    try {
-        if (typeof window === 'undefined')
-            return false;
-        const w = window;
-        if (w.__motif_DEVTOOLS === true)
-            return true;
-        if (globalThis.__MOTIF_DEVTOOLS__ === true)
-            return true;
-        if (globalThis.__MOTIF_DEVTOOLS_FLAG === true)
-            return true;
-        return false;
-    }
-    catch {
-        return false;
-    }
-}
-function exposeBus(visible) {
-    try {
-        if (visible)
-            window.__motifDevBus = { on, emit, warn, getWarnings, isEnabled, setRoutes, getRoutes };
-        else
-            delete window.__motifDevBus;
-    }
-    catch { }
-}
-function ensureDevtoolsFlagInitialized() {
-    if (state.enabled)
-        return;
-    state.enabled = isRequestedByFlag();
-    if (state.enabled)
-        exposeBus(true);
-}
-function setDevtoolsEnabled(enabled) {
-    state.enabled = enabled || isRequestedByFlag();
-    exposeBus(state.enabled);
-}
-function isEnabled() { return state.enabled; }
-function on(listener) {
-    state.listeners.add(listener);
-    return () => { state.listeners.delete(listener); };
-}
-function emit(type, payload) {
-    const ev = { type, payload };
-    for (const l of state.listeners) {
-        try {
-            l(ev);
-        }
-        catch { }
-    }
-    try {
-        const bus = globalThis.__MOTIF_DEVTOOLS_BUS__;
-        if (bus && typeof bus.publish === 'function') {
-            bus.publish('devtools:' + type, payload);
-        }
-    }
-    catch { }
-}
-function warn(code, message, details) {
-    if (!isDevLike())
-        return;
-    const w = { code, message, details };
-    state.warnings.push(w);
-    try {
-        if (typeof console !== 'undefined')
-            details === undefined ? console.warn(`[motifjs] ${code}: ${message}`) : console.warn(`[motifjs] ${code}: ${message}`, details);
-    }
-    catch { }
-    emit('warning', w);
-}
-function getWarnings() { return state.warnings.slice(); }
-function setRoutes(routes) { state.routes = routes; }
-function getRoutes() { return state.routes; }
-
 const motifMessages = {
     MJX101: (tag) => `dom.createElement('${tag}'): no document is available (no DOM environment).`,
     MJX102: (description) => `Invalid element selector "${description}".`,
@@ -347,7 +317,6 @@ const motifMessages = {
     MJX608: () => `Method not implemented.`,
     MJX609: () => `OperationRunner: the operation threw.`,
     MJX610: () => `Matching the request path failed.`,
-    MJX611: () => `The devtools panel failed to load.`,
 };
 class MotifError extends Error {
     constructor(code, message, options) {
@@ -430,11 +399,27 @@ class DisposableStore {
         if (this._closed) {
             reportWarning('MJX504', [], new Error().stack);
         }
-        else {
-            (this._items ??= new Set()).add(item);
+        else if (this._items !== undefined) {
+            this._items.add(item);
+        }
+        else if (this._one === undefined) {
+            this._one = item;
+        }
+        else if (this._one !== item) {
+            this._items = new Set([this._one, item]);
+            this._one = undefined;
         }
         return item;
     }
+    _take(item) {
+        if (this._items !== undefined)
+            return this._items.delete(item);
+        if (this._one === item) {
+            this._one = undefined;
+            return true;
+        }
+        return false;
+    }
     delete(item) {
         if (!item) {
             return;
@@ -442,29 +427,48 @@ class DisposableStore {
         if (item === this) {
             throw motifError('MJX505');
         }
-        this._items?.delete(item);
+        this._take(item);
         item.dispose();
     }
     detach(item) {
-        if (item && this._items?.delete(item)) {
+        if (item && this._take(item)) {
             disposableCore.notifyOwner(item, null);
         }
     }
     clear() {
-        const items = this._items;
-        if (!items || items.size === 0) {
+        if (this._one === undefined && (this._items === undefined || this._items.size === 0)) {
             return;
         }
         const failures = [];
-        for (const item of items) {
+        let done;
+        for (;;) {
+            const items = this._items;
+            if (items !== undefined) {
+                for (const item of items) {
+                    if (item === done)
+                        continue;
+                    try {
+                        item?.dispose();
+                    }
+                    catch (error) {
+                        failures.push(error);
+                    }
+                }
+                items.clear();
+                break;
+            }
+            const one = this._one;
+            if (one === undefined || one === done)
+                break;
+            done = one;
             try {
-                item?.dispose();
+                one.dispose();
             }
             catch (error) {
                 failures.push(error);
             }
         }
-        items.clear();
+        this._one = undefined;
         if (failures.length === 1) {
             throw failures[0];
         }
@@ -504,16 +508,19 @@ class Disposable {
         disposableCore.notifyCreated(this);
     }
     dispose() {
-        disposableCore.notifyDisposed(this);
         const owned = this._store;
+        if (owned === null) {
+            reportWarning('MJX501', [], { disposable: this });
+            return;
+        }
+        if (owned !== undefined && owned.isDisposed)
+            return;
+        disposableCore.notifyDisposed(this);
         if (owned === undefined) {
             this._store = sharedClosedStore();
         }
-        else if (owned && typeof owned.dispose === 'function') {
-            owned.dispose();
-        }
         else {
-            reportWarning('MJX501', [], { disposable: this });
+            owned.dispose();
         }
     }
     _register(item) {
@@ -703,9 +710,7 @@ class ListBinding {
             component.motif.options.__fromList = true;
         }
         catch { }
-        if (typeof component.__listAdopted === 'undefined') {
-            component.__listAdopted = component.parent !== null && component.parent !== undefined;
-        }
+        noteListAdopted(component);
         return component;
     }
     get _indexSensitive() {
@@ -764,7 +769,7 @@ class ListBinding {
             const seenKeys = new Map();
             const claimed = new Set();
             const positionalReuse = new Map();
-            const isReusable = (c) => !!c && !c.isDisposed && !claimed.has(c) && !c.__listAdopted;
+            const isReusable = (c) => !!c && !c.isDisposed && !claimed.has(c) && !isListAdopted(c);
             const shared = Math.min(items.length, prevItems.length);
             for (let i = 0; i < shared; i++) {
                 const it = items[i];
@@ -850,7 +855,7 @@ class ListBinding {
                     list.length = count;
             });
             this._rendered.forEach(comp => {
-                if (!usedComponents.has(comp) && !comp.__listAdopted) {
+                if (!usedComponents.has(comp) && !isListAdopted(comp)) {
                     try {
                         comp.dispose();
                     }
@@ -1177,6 +1182,15 @@ exports.NodeTypes = void 0;
     NodeTypes[NodeTypes["NOTATION_NODE"] = 12] = "NOTATION_NODE";
 })(exports.NodeTypes || (exports.NodeTypes = {}));
 
+function pushTight(list, value) {
+    if (list.length === 0) {
+        list.length = 1;
+        list[0] = value;
+        return;
+    }
+    list.push(value);
+}
+
 class Effect {
     constructor(fn, callback) {
         this.fn = fn;
@@ -1236,7 +1250,7 @@ function track(target, key) {
         deps.set(key, (dep = new Set()));
     if (!dep.has(effect)) {
         dep.add(effect);
-        effect.deps.push([rawTarget, key]);
+        pushTight(effect.deps, [rawTarget, key]);
         if (leakEnabled && leakMonitor && leakThreshold > 0) {
             try {
                 const cleanup = leakMonitor.check(dep.size);
@@ -1628,6 +1642,43 @@ class Binding {
     }
 }
 
+class QuietCleanup {
+    constructor(_fn) {
+        this._fn = _fn;
+    }
+    dispose() {
+        const fn = this._fn;
+        if (fn === undefined)
+            return;
+        this._fn = undefined;
+        try {
+            fn();
+        }
+        catch { }
+    }
+}
+class TrackedCleanup {
+    constructor(_fn) {
+        this._fn = _fn;
+        disposableCore.notifyCreated(this);
+    }
+    dispose() {
+        const fn = this._fn;
+        if (fn === undefined)
+            return;
+        this._fn = undefined;
+        disposableCore.notifyDisposed(this);
+        fn();
+    }
+}
+const coreToDisposable = disposableCore.toDisposable;
+function quietCleanup(fn) {
+    return new QuietCleanup(fn);
+}
+function trackedCleanup(fn) {
+    return disposableCore.toDisposable === coreToDisposable ? new TrackedCleanup(fn) : disposableCore.toDisposable(fn);
+}
+
 const RAW_KEY = Flags.RAW;
 function isPrototypeObject(o) {
     return Object.prototype.hasOwnProperty.call(o, 'constructor') && typeof o.constructor === 'function' && o.constructor.prototype === o;
@@ -1694,12 +1745,7 @@ class BindingCollection {
             this._branchScope.push(stop);
             return;
         }
-        this._component.motif.register(toDisposable(() => {
-            try {
-                stop();
-            }
-            catch { }
-        }));
+        this._component.motif.register(quietCleanup(stop));
     }
     when(computeFn, renderFn) {
         var frame = new Frame();
@@ -1743,7 +1789,7 @@ class BindingCollection {
             const [propertyName, dataSource, dataMember, formatString, formatInfo] = args;
             binding = new Binding(this._component, propertyName, dataSource, dataMember, formatString, formatInfo);
         }
-        this._items.push(binding);
+        pushTight(this._items, binding);
         if (this._component.isBuilt) {
             binding.activate();
         }
@@ -1751,7 +1797,7 @@ class BindingCollection {
     }
     wait(predicate) {
         const binding = new Binding(this._component, 'isWait', predicate);
-        this._items.push(binding);
+        pushTight(this._items, binding);
         if (this._component.isBuilt) {
             binding.activate();
         }
@@ -1759,7 +1805,7 @@ class BindingCollection {
     }
     display(predicate) {
         const binding = new Binding(this._component, 'isWait', () => !resolveValue(predicate()));
-        this._items.push(binding);
+        pushTight(this._items, binding);
         if (this._component.isBuilt) {
             binding.activate();
         }
@@ -1767,7 +1813,7 @@ class BindingCollection {
     }
     html(predicate) {
         const binding = new Binding(this._component, 'innerHTML', predicate);
-        this._items.push(binding);
+        pushTight(this._items, binding);
         if (this._component.isBuilt) {
             binding.activate();
         }
@@ -1775,7 +1821,7 @@ class BindingCollection {
     }
     list(itemsFn, renderFn, options) {
         const binding = new ListBinding(this._component, itemsFn, renderFn, options);
-        this._items.push(binding);
+        pushTight(this._items, binding);
         if (this._component.isBuilt) {
             binding.activate();
         }
@@ -1783,7 +1829,7 @@ class BindingCollection {
     }
     loop(itemsFn, renderFn, options) {
         const binding = new ListBinding(this._component, itemsFn, renderFn, options);
-        this._items.push(binding);
+        pushTight(this._items, binding);
         if (this._component.isBuilt) {
             binding.activate();
         }
@@ -1822,12 +1868,7 @@ class BindingCollection {
             }
             frame.navigate(result == null ? motifFragment() : result);
         });
-        host.motif.register(toDisposable(() => {
-            try {
-                stop();
-            }
-            catch { }
-        }));
+        host.motif.register(quietCleanup(stop));
     }
     ternary(conditionFn, trueFn, falseFn) {
         const frame = new Frame();
@@ -1894,12 +1935,7 @@ class BindingCollection {
         const ef = effect(() => {
             cb();
         });
-        this._component.motif.register(toDisposable(() => {
-            try {
-                ef();
-            }
-            catch { }
-        }));
+        this._component.motif.register(quietCleanup(ef));
     }
     remove(binding) {
         const index = this._items.indexOf(binding);
@@ -2001,7 +2037,7 @@ class BindingCollection {
             this._component.motif.on('input', writeBack);
             this._component.motif.on('change', writeBack);
         }
-        this._items.push(binding);
+        pushTight(this._items, binding);
         if (this._component.isBuilt) {
             binding.activate();
         }
@@ -2067,12 +2103,7 @@ class BindingCollection {
                 frame.navigate(motifFragment());
             }
         });
-        this._component.motif.register(toDisposable(() => {
-            try {
-                ef();
-            }
-            catch { }
-        }));
+        this._component.motif.register(quietCleanup(ef));
         return null;
     }
 }
@@ -2265,7 +2296,7 @@ class ComponentEmiter {
                 sources.set(lower, set);
             }
             set.add(disp);
-            this.component.motif.register(disposableCore.toDisposable(() => {
+            this.component.motif.register(trackedCleanup(() => {
                 try {
                     disp?.dispose();
                 }
@@ -2855,9 +2886,62 @@ class controlClass {
         this._watcherSeq = 0;
         this._parent = parent;
     }
-    get _counts() { return this._countsStore ??= new Map(); }
-    get _staticSet() { return this._staticSetStore ??= new Set(); }
-    get _watchers() { return this._watchersStore ??= new Map(); }
+    get _counts() {
+        if (this._plain !== undefined)
+            this._promote();
+        return this._countsStore ?? this._createCounts();
+    }
+    _createCounts() {
+        const counts = this._countsStore = new Map();
+        if (this._sole !== undefined) {
+            const one = this._watcherOne;
+            this._sole = undefined;
+            if (one !== undefined)
+                for (const cls of one.set)
+                    counts.set(cls, (counts.get(cls) || 0) + 1);
+        }
+        return counts;
+    }
+    get _staticSet() {
+        if (this._plain !== undefined)
+            this._promote();
+        return this._staticSetStore ??= new Set();
+    }
+    _promote() {
+        const names = this._plain.split(' ');
+        this._plain = undefined;
+        const set = this._staticSetStore ??= new Set();
+        const counts = this._countsStore ?? this._createCounts();
+        for (const cls of names) {
+            set.add(cls);
+            counts.set(cls, (counts.get(cls) || 0) + 1);
+        }
+    }
+    _watcherEntries() {
+        if (this._watchersStore !== undefined)
+            return Array.from(this._watchersStore.entries());
+        const one = this._watcherOne;
+        return one !== undefined ? [[one.id, one]] : [];
+    }
+    _dropWatcher(id) {
+        if (this._watchersStore !== undefined)
+            this._watchersStore.delete(id);
+        else if (this._watcherOne !== undefined && this._watcherOne.id === id)
+            this._watcherOne = undefined;
+    }
+    _keepWatcher(rec) {
+        if (this._watchersStore !== undefined) {
+            this._watchersStore.set(rec.id, rec);
+            return;
+        }
+        const one = this._watcherOne;
+        if (one === undefined) {
+            this._watcherOne = rec;
+            return;
+        }
+        this._watcherOne = undefined;
+        this._watchersStore = new Map([[one.id, one], [rec.id, rec]]);
+    }
     add(...values) {
         for (const value of values) {
             if (typeof value === 'function') {
@@ -2869,12 +2953,36 @@ class controlClass {
             else if (value && typeof value === 'object') {
                 this._addStaticFromObject(value);
             }
+            else if (typeof value === 'string' && value !== '' && !/\s/.test(value)) {
+                this._addStaticName(value);
+            }
             else {
                 this._addStaticNames(this._splitClasses(String(value ?? '')));
             }
         }
         return this._parent;
     }
+    _addStaticName(cls) {
+        if (this._countsStore !== undefined || this._staticSetStore !== undefined || this._sole !== undefined) {
+            this._addStaticNames([cls]);
+            return;
+        }
+        const plain = this._plain;
+        if (plain !== undefined && hasName(plain, cls))
+            return;
+        this._plain = plain === undefined ? cls : plain + ' ' + cls;
+        const el = this._getElement();
+        if (!el)
+            return;
+        if (!el.hasAttribute('class'))
+            el.setAttribute('class', cls);
+        else {
+            try {
+                el.classList.add(cls);
+            }
+            catch { }
+        }
+    }
     remove(classNames) {
         const el = this._getElement();
         if (Array.isArray(classNames)) {
@@ -2888,7 +2996,7 @@ class controlClass {
         }
         else {
             if (classNames === '**') {
-                for (const [id, w] of Array.from(this._watchers.entries())) {
+                for (const [id, w] of this._watcherEntries()) {
                     const prev = new Set(w.set);
                     this._applySourceDiff(id, prev, new Set(), el);
                     try {
@@ -2899,7 +3007,7 @@ class controlClass {
                         w.stop();
                     }
                     catch { }
-                    this._watchers.delete(id);
+                    this._dropWatcher(id);
                 }
                 const prev = new Set(this._staticSet);
                 this._staticSet.clear();
@@ -2942,7 +3050,7 @@ class controlClass {
             return [input];
         return input.split(/\s+/).filter(s => s.length > 0);
     }
-    _normalizeToSet(values, key) {
+    _normalizeToSet(values) {
         const result = new Set();
         if (values == null)
             return result;
@@ -2972,13 +3080,7 @@ class controlClass {
                         }
                     }
                 }
-                else if (typeof item === 'boolean') {
-                    if (key && item) {
-                        for (const cls of this._splitClasses(String(key)))
-                            result.add(cls);
-                    }
-                }
-                else {
+                else if (typeof item !== 'boolean') {
                     for (const cls of this._splitClasses(String(item)))
                         result.add(cls);
                 }
@@ -2994,19 +3096,32 @@ class controlClass {
                 }
             }
         }
-        else if (typeof values === 'boolean') {
-            if (key && values) {
-                for (const cls of this._splitClasses(String(key)))
-                    result.add(cls);
-            }
-        }
-        else {
+        else if (typeof values !== 'boolean') {
             for (const cls of this._splitClasses(String(values)))
                 result.add(cls);
         }
         return result;
     }
     _applySourceDiff(sourceId, prev, next, el) {
+        if (this._countsStore === undefined && this._plain === undefined && this._sole === sourceId) {
+            for (const cls of prev) {
+                if (!next.has(cls) && el) {
+                    try {
+                        el.classList.remove(cls);
+                    }
+                    catch { }
+                }
+            }
+            for (const cls of next) {
+                if (!prev.has(cls) && el) {
+                    try {
+                        el.classList.add(cls);
+                    }
+                    catch { }
+                }
+            }
+            return;
+        }
         for (const cls of prev) {
             if (!next.has(cls)) {
                 const prevCount = this._counts.get(cls) || 0;
@@ -3121,7 +3236,11 @@ class controlClass {
         for (const k of Object.keys(obj)) {
             const v = obj[k];
             const keys = this._splitClasses(String(k));
-            if (!!v) {
+            if (typeof v === 'function') {
+                for (const cls of keys)
+                    this._addReactive(v, cls);
+            }
+            else if (!!v) {
                 for (const cls of keys)
                     this._staticSet.add(cls);
             }
@@ -3134,13 +3253,17 @@ class controlClass {
     }
     _addReactive(fn, key) {
         const id = `fx#${++this._watcherSeq}`;
-        const rec = { stop: () => { }, binding: undefined, set: new Set() };
+        const rec = { id, stop: () => { }, binding: undefined, set: new Set() };
         const el = this._getElement();
+        if (this._countsStore === undefined && this._staticSetStore === undefined && this._plain === undefined && this._sole === undefined && this._watcherOne === undefined && this._watchersStore === undefined)
+            this._sole = id;
         const run = () => effect(() => {
             let next;
             try {
-                const v = fn();
-                next = this._normalizeToSet(v, key);
+                let v = fn();
+                if (key !== undefined && typeof v === 'function')
+                    v = v();
+                next = key !== undefined ? (v ? new Set([key]) : new Set()) : this._normalizeToSet(v);
             }
             catch {
                 next = new Set();
@@ -3176,9 +3299,19 @@ class controlClass {
         catch { }
         rec.stop = stop;
         rec.binding = binding;
-        this._watchers.set(id, rec);
+        this._keepWatcher(rec);
     }
 }
+function hasName(list, name) {
+    let i = list.indexOf(name);
+    while (i !== -1) {
+        const end = i + name.length;
+        if ((i === 0 || list.charCodeAt(i - 1) === 32) && (end === list.length || list.charCodeAt(end) === 32))
+            return true;
+        i = list.indexOf(name, i + 1);
+    }
+    return false;
+}
 
 const shimAnimation = {
     cancel() { },
@@ -3416,7 +3549,7 @@ class ComponentMotif {
         this._component['_register'](c);
     }
     setDisposable(c) {
-        this._component['_register'](disposableCore.toDisposable(c));
+        this._component['_register'](trackedCleanup(c));
     }
     stopAnimations() {
         return this._component['_stopAnimations']();
@@ -4239,6 +4372,9 @@ const F_WAIT = 128;
 const F_POSTCONFIG = 256;
 const F_PREBOUND = 512;
 const F_DISPOSED_FIRED = 1024;
+const F_BUILDING = 2048;
+const F_LIST_SEEN = 4096;
+const F_LIST_ADOPTED = 8192;
 function optionsOf(c) {
     return c?._motif?.options;
 }
@@ -4265,12 +4401,12 @@ function enterModeOf(container) {
         const node = c.element;
         if (!node || node.nodeType !== Node.COMMENT_NODE)
             break;
-        c = c.parent ?? c._leaveContainer;
+        c = c.parent ?? c._baseCtx?._leaveContainer;
     }
     return transitionSettings.mode;
 }
 function leaveModeOf(c) {
-    return enterModeOf(c.parent ?? c._leaveContainer);
+    return enterModeOf(c.parent ?? c._baseCtx?._leaveContainer);
 }
 function wantsEnterTransition(c) {
     const o = c?._motif?.options;
@@ -4440,12 +4576,14 @@ class ComponentOptionsImpl {
     set enableRouterClassing(value) {
         try {
             const ins = this[OPTIONS_OWNER];
-            const callback = ins.context.onRouterChanged(() => {
+            const off = contextApplication(ins).onRouterChanged(() => {
                 ComponentHelper.routerClassing.call(ins, value);
             });
-            ins.motif.register(disposableCore.toDisposable(() => {
-                callback();
-            }));
+            if (ins.isDisposed) {
+                off();
+                return;
+            }
+            ins.motif.register(trackedCleanup(off));
             ComponentHelper.routerClassing.call(ins, value);
         }
         catch (error) {
@@ -4496,14 +4634,12 @@ function runHooks(base, listName, sender, ev, label) {
         callReported(() => fn(sender, ev), 'MJX122', label);
     }
 }
-function hasLifecycleHook(component, hook, listName, lowerName, legacyProp) {
+function hasLifecycleHook(component, hook, listName, lowerName) {
     if (component[hook])
         return true;
     const base = component._baseCtx;
     if (base?.[listName])
         return true;
-    if (legacyProp && component[legacyProp])
-        return true;
     return !!base?._emiters?.hasListeners(lowerName);
 }
 const RESERVED_METHODS = ['build', 'setState', 'reState', 'setText', 'style', 'dispose', 'disposeAsync', 'using', 'doWork', 'getService', '$', 'useModel', 'context', 'siblings', 'serviceProvider', 'isWait'];
@@ -4561,6 +4697,16 @@ function checkReservedMembers(c) {
         reportWarning('MJX128', [name, member, how]);
     }
 }
+function releaseInitializers(c) {
+    c._init = undefined;
+    const base = c._baseCtx;
+    if (base === undefined)
+        return;
+    if (base._initializeComponentHandlers !== undefined)
+        base._initializeComponentHandlers = undefined;
+    if (base._onInitializeComponentHandlers !== undefined)
+        base._onInitializeComponentHandlers = undefined;
+}
 const ComponentHelper = {
     callInitializeComponent(component) {
         const sender = component;
@@ -4584,12 +4730,13 @@ const ComponentHelper = {
         }
         // 4) aggregated extra oninitializeComponent handlers (örn, from props)
         runHooks(component._baseCtx, '_onInitializeComponentHandlers', sender, ev, 'oninitializeComponent');
+        releaseInitializers(component);
     },
     callDisposing(component) {
         if (!component || component.isDisposed) {
             return;
         }
-        if (!hasLifecycleHook(component, 'onDisposing', '_onDisposingHandlers', 'ondisposing', 'ondisposing')) {
+        if (!hasLifecycleHook(component, 'onDisposing', '_onDisposingHandlers', 'ondisposing')) {
             return;
         }
         const sender = component, ev = { cancel: false };
@@ -4597,9 +4744,6 @@ const ComponentHelper = {
             callReported(() => component.onDisposing(sender, ev), 'MJX122', 'onDisposing');
         }
         runHooks(component._baseCtx, '_onDisposingHandlers', sender, ev, 'onDisposing');
-        if (component.ondisposing) {
-            callReported(() => component.ondisposing(sender, ev), 'MJX122', 'ondisposing');
-        }
         fireLifecycle(component, 'ondisposing', ev);
     },
     callActivated(component) {
@@ -4662,19 +4806,16 @@ const ComponentHelper = {
             return;
         }
         component._flags |= F_DISPOSED_FIRED;
-        if (hasLifecycleHook(component, 'onDisposed', '_onDisposedHandlers', 'ondisposed', 'ondisposed')) {
+        if (hasLifecycleHook(component, 'onDisposed', '_onDisposedHandlers', 'ondisposed')) {
             const sender = component, ev = { cancel: false };
             if (component.onDisposed) {
                 callReported(() => component.onDisposed(sender, ev), 'MJX122', 'onDisposed');
             }
             runHooks(component._baseCtx, '_onDisposedHandlers', sender, ev, 'onDisposed');
-            if (component.ondisposed) {
-                callReported(() => component.ondisposed(sender, ev), 'MJX122', 'ondisposed');
-            }
             fireLifecycle(component, 'ondisposed', ev);
         }
         try {
-            globalThis.__MOTIF_DEVTOOLS_BUS__?.publish?.('component:disposed', { id: component.id, type: component.constructor?.name });
+            devtools()?.('component:disposed', { id: component.id, type: component.constructor?.name });
         }
         catch { }
     },
@@ -4682,19 +4823,16 @@ const ComponentHelper = {
         if (!component || component.isDisposed) {
             return;
         }
-        if (hasLifecycleHook(component, 'onBuilt', '_onBuiltHandlers', 'onbuilt', 'onbuilt')) {
+        if (hasLifecycleHook(component, 'onBuilt', '_onBuiltHandlers', 'onbuilt')) {
             const sender = component, ev = { cancel: false };
             if (component.onBuilt) {
                 callReported(() => component.onBuilt(sender, ev), 'MJX122', 'onBuilt');
             }
             runHooks(component._baseCtx, '_onBuiltHandlers', sender, ev, 'onBuilt');
-            if (component.onbuilt) {
-                callReported(() => component.onbuilt(sender, ev), 'MJX122', 'onbuilt');
-            }
             fireLifecycle(component, 'onbuilt', ev);
         }
         try {
-            globalThis.__MOTIF_DEVTOOLS_BUS__?.publish?.('component:mounted', { id: component.id, type: component.constructor?.name });
+            devtools()?.('component:mounted', { id: component.id, type: component.constructor?.name });
         }
         catch { }
     },
@@ -4703,8 +4841,7 @@ const ComponentHelper = {
             return;
         }
         const hasHook = typeof component.onMounted === 'function'
-            || !!component._baseCtx?._onMountedHandlers
-            || typeof component.onmounted === 'function';
+            || !!component._baseCtx?._onMountedHandlers;
         if (!hasHook) {
             return;
         }
@@ -4720,7 +4857,7 @@ const ComponentHelper = {
             ComponentHelper.callMounted(component);
         });
         if (stop) {
-            component._register(disposableCore.toDisposable(stop));
+            component._register(trackedCleanup(stop));
         }
     },
     callMounted(component) {
@@ -4733,9 +4870,6 @@ const ComponentHelper = {
             callReported(() => component.onMounted(sender, ev), 'MJX122', 'onMounted');
         }
         runHooks(component._baseCtx, '_onMountedHandlers', sender, ev, 'onMounted');
-        if (component.onmounted) {
-            callReported(() => component.onmounted(sender, ev), 'MJX122', 'onmounted');
-        }
         fireLifecycle(component, 'onmounted', ev);
     },
     callBuilding(component) {
@@ -4983,7 +5117,7 @@ const ComponentHelper = {
             const path = value.path;
             if (this.isDisposed)
                 return;
-            const router = this.context?.router;
+            const router = contextApplication(this)?.router;
             if (!router)
                 return;
             const requestPath = router.uri.startsWith('/') ? router.uri : '/' + router.uri;
@@ -5204,11 +5338,11 @@ function deepCleanup(c) {
     }
     catch { }
     try {
-        c._attr?._attrMapStore?.clear();
+        c._baseCtx?._attr?._attrMapStore?.clear();
     }
     catch { }
     try {
-        c._attr?._watchersStore?.clear();
+        c._baseCtx?._attr?._watchersStore?.clear();
     }
     catch { }
     try {
@@ -5294,6 +5428,44 @@ function subtreeDisposesSync(c, root) {
     return true;
 }
 const teardownApplications = new WeakMap();
+let teardownSeen = false;
+let contextOverridden = false;
+let lastCheckedCtor;
+const checkedCtors = new WeakSet();
+let baseContextGetter;
+function noteContextOverride(ctor) {
+    if (contextOverridden || ctor === lastCheckedCtor)
+        return;
+    lastCheckedCtor = ctor;
+    if (checkedCtors.has(ctor))
+        return;
+    checkedCtors.add(ctor);
+    baseContextGetter ??= Object.getOwnPropertyDescriptor(ComponentBase.prototype, 'context').get;
+    if (ctor.prototype.__lookupGetter__('context') !== baseContextGetter)
+        contextOverridden = true;
+}
+function applicationOf(c) {
+    const parent = c.parent;
+    let app;
+    if (parent) {
+        baseContextGetter ??= Object.getOwnPropertyDescriptor(ComponentBase.prototype, 'context').get;
+        if (parent.__lookupGetter__('context') === baseContextGetter)
+            app = applicationOf(parent);
+        else {
+            const ctx = parent.context;
+            app = ctx?.[RAW_APPLICATION] ?? ctx;
+        }
+    }
+    return app ?? teardownApplications.get(c) ?? Application.main;
+}
+function contextApplication(c) {
+    baseContextGetter ??= Object.getOwnPropertyDescriptor(ComponentBase.prototype, 'context').get;
+    if (c.__lookupGetter__('context') !== baseContextGetter) {
+        const ctx = c.context;
+        return ctx?.[RAW_APPLICATION] ?? ctx;
+    }
+    return contextOverridden || teardownSeen ? applicationOf(c) : Application.main;
+}
 function owningApplication(c) {
     for (let p = c; p; p = p.parent) {
         if (p.application)
@@ -5308,14 +5480,16 @@ function disposePrefix(c, options, asChild) {
     const ctx = asChild ? 'disposeAsync' : 'dispose';
     if (Application._disposingCount > 0) {
         const app = owningApplication(c);
-        if (app && app.state === 'disposing')
+        if (app && app.state === 'disposing') {
             teardownApplications.set(c, app);
+            teardownSeen = true;
+        }
     }
     if (!asChild && options?.skipLeaveTransition) {
         c.motif.options.transition.skipNextLeave = true;
     }
     safeCall(() => { ComponentHelper.callDisposing.call(c, c); }, ctx + '.callDisposing');
-    offAll(c);
+    offAll(c, asChild && c._keepElementOnDispose !== true && c.element?.isConnected === false);
     deactivateBindings(c);
     safeCall(() => { c.parent?.controls?.silentDetach?.(c, true); }, ctx + '.silentDetach');
 }
@@ -5497,6 +5671,8 @@ class EventRecord {
     }
     handleEvent(ev) {
         const flags = this.flags;
+        if ((flags & EV_REMOVED) !== 0)
+            return;
         const owner = this.owner;
         if ((flags & EV_SELF) !== 0 && ev.target !== owner.element)
             return;
@@ -5572,7 +5748,7 @@ function hasEventKey(c, key) {
     }
     return false;
 }
-function offAll(c) {
+function offAll(c, detached = false) {
     const head = c._eventHandlers;
     if (head === undefined)
         return;
@@ -5580,6 +5756,12 @@ function offAll(c) {
         if ((r.flags & (EV_DOM | EV_REMOVED)) !== EV_DOM) {
             continue;
         }
+        if (detached) {
+            r.flags |= EV_REMOVED;
+            r.owner = undefined;
+            r.original = undefined;
+            continue;
+        }
         try {
             c.element.removeEventListener(r.type, r, (r.flags & EV_CAPTURE) !== 0);
         }
@@ -5617,6 +5799,18 @@ function activatePreBindings(c) {
     }
     c._flags |= F_PREBOUND;
 }
+function setLeaveContainer(c, owner) {
+    (c._baseCtx ?? (c._baseCtx = createBaseCtx(c)))._leaveContainer = owner;
+}
+function noteListAdopted(c) {
+    const f = c._flags;
+    if ((f & F_LIST_SEEN) !== 0)
+        return;
+    c._flags = f | F_LIST_SEEN | (c.parent !== null && c.parent !== undefined ? F_LIST_ADOPTED : 0);
+}
+function isListAdopted(c) {
+    return (c._flags & F_LIST_ADOPTED) !== 0;
+}
 function createBaseCtx(owner) {
     const base = Object.create(BASE_PROTO);
     base.owner = owner;
@@ -5751,10 +5945,16 @@ class ComponentBase extends Disposable {
         this._class = value;
     }
     get attr() {
-        return this._attr !== undefined || (this.isDisposed && !this.element) ? this._attr : (this._attr = new controlAttribute(this));
+        const base = this._baseCtx;
+        const attr = base !== undefined ? base._attr : undefined;
+        return attr !== undefined || (this.isDisposed && !this.element) ? attr : (this._base._attr = new controlAttribute(this));
     }
     set attr(value) {
-        this._attr = value;
+        const base = this._baseCtx;
+        if (base !== undefined)
+            base._attr = value;
+        else if (value !== undefined)
+            this._base._attr = value;
     }
     get bindings() {
         return this._bindings !== undefined || (this.isDisposed && !this.element) ? this._bindings : (this._bindings = new BindingCollection(this));
@@ -5793,7 +5993,7 @@ class ComponentBase extends Disposable {
             }
             return;
         }
-        if (value === false && this.parent && this.parent.isBuilt) {
+        if (value === false && this.parent && this.parent.isBuilt && (this._flags & F_BUILDING) === 0) {
             ComponentHelper.internalBuild.call(this.parent, this);
         }
     }
@@ -5806,12 +6006,11 @@ class ComponentBase extends Disposable {
         this._flags = 0;
         this._controls = undefined;
         this._class = undefined;
-        this._attr = undefined;
         this._bindings = undefined;
         this._baseCtx = undefined;
         this._init = undefined;
-        this._leaveContainer = undefined;
         this.parent = null;
+        noteContextOverride(new.target);
         const asComponentRoot = constructingComponentRoot;
         constructingComponentRoot = false;
         recordServiceOwner(this);
@@ -5870,8 +6069,7 @@ class ComponentBase extends Disposable {
         return this._baseCtx !== undefined || (this.isDisposed && !this.element) ? this._baseCtx : (this._baseCtx = createBaseCtx(this));
     }
     get context() {
-        const parentCtx = this.parent?.context;
-        const app = parentCtx?.[RAW_APPLICATION] ?? parentCtx ?? teardownApplications.get(this) ?? Application.main;
+        const app = (contextOverridden || teardownSeen ? applicationOf(this) : Application.main);
         if (!app) {
             return app;
         }
@@ -5889,7 +6087,7 @@ class ComponentBase extends Disposable {
             off();
             return off;
         }
-        const d = this._register(disposableCore.toDisposable(off));
+        const d = this._register(trackedCleanup(off));
         return () => { this._disposables.detach(d); off(); };
     }
     build(building = true) {
@@ -5902,136 +6100,142 @@ class ComponentBase extends Disposable {
         if (this.isBuilt || this.isWait) {
             return;
         }
-        ComponentHelper.callBuilding(this);
-        if (this.isDisposed) {
-            return;
-        }
-        var ph = this.element;
-        if (building) {
-            ph = dom.createDocumentFragment();
-        }
-        const isFragment = (typeof this.element !== 'string' && this.element.nodeType === Node.COMMENT_NODE);
-        if (isFragment) {
-            this.motif.options.cache = dom.createDocumentFragment();
-            this.element.textContent = "[";
-            this.motif.options.cache.appendChild(this.element);
-        }
-        if (this.isBuilt) {
-            return;
-        }
-        ComponentHelper.callInitializeComponent(this);
-        if (this.isDisposed) {
-            return;
-        }
-        if (this.view) {
-            const templ = this.view();
-            this.controls.add(templ);
+        this._flags |= F_BUILDING;
+        try {
+            ComponentHelper.callBuilding(this);
             if (this.isDisposed) {
                 return;
             }
-        }
-        const deferredSelectValue = this.element?.nodeName === 'SELECT'
-            ? this.bindings.items.filter(b => b.propertyName === 'value')
-            : NO_BINDINGS;
-        if (deferredSelectValue.length) {
-            try {
-                this.bindings.items.filter(b => !deferredSelectValue.includes(b)).forEach(b => b.activate());
+            var ph = this.element;
+            if (building) {
+                ph = dom.createDocumentFragment();
             }
-            catch { }
-        }
-        else {
-            activateBindings(this);
-        }
-        const kids = childrenOf(this);
-        for (const element of kids.length ? kids.slice() : kids) {
-            var target = isFragment ? this.motif.options.cache : this.element;
-            if (!element.isWait) {
-                element.parent = this;
-                element.build(false);
+            const isFragment = (typeof this.element !== 'string' && this.element.nodeType === Node.COMMENT_NODE);
+            if (isFragment) {
+                this.motif.options.cache = dom.createDocumentFragment();
+                this.element.textContent = "[";
+                this.motif.options.cache.appendChild(this.element);
             }
-            if (element.isWait) {
-                if (keepsTrace(element)) {
-                    const opts = element.motif.options;
-                    (building ? ph : target).appendChild(opts.placeholder ?? (opts.placeholder = dom.createComment("h")));
-                }
-                continue;
+            if (this.isBuilt) {
+                return;
             }
-            if (building) {
-                const cache = optionsOf(element)?.cache;
-                if (cache) {
-                    ph.appendChild(cache);
+            ComponentHelper.callInitializeComponent(this);
+            if (this.isDisposed) {
+                return;
+            }
+            if (this.view) {
+                const templ = this.view();
+                this.controls.add(templ);
+                if (this.isDisposed) {
+                    return;
                 }
-                else {
-                    ph.appendChild(element.element);
+            }
+            const deferredSelectValue = this.element?.nodeName === 'SELECT'
+                ? this.bindings.items.filter(b => b.propertyName === 'value')
+                : NO_BINDINGS;
+            if (deferredSelectValue.length) {
+                try {
+                    this.bindings.items.filter(b => !deferredSelectValue.includes(b)).forEach(b => b.activate());
                 }
+                catch { }
             }
             else {
-                const cache = optionsOf(element)?.cache;
-                if (cache) {
-                    target.appendChild(cache);
+                activateBindings(this);
+            }
+            const kids = childrenOf(this);
+            for (const element of kids.length ? kids.slice() : kids) {
+                var target = isFragment ? this.motif.options.cache : this.element;
+                if (!element.isWait) {
+                    element.parent = this;
+                    element.build(false);
+                }
+                if (element.isWait) {
+                    if (keepsTrace(element)) {
+                        const opts = element.motif.options;
+                        (building ? ph : target).appendChild(opts.placeholder ?? (opts.placeholder = dom.createComment("h")));
+                    }
+                    continue;
+                }
+                if (building) {
+                    const cache = optionsOf(element)?.cache;
+                    if (cache) {
+                        ph.appendChild(cache);
+                    }
+                    else {
+                        ph.appendChild(element.element);
+                    }
                 }
                 else {
-                    target.appendChild(element.element);
+                    const cache = optionsOf(element)?.cache;
+                    if (cache) {
+                        target.appendChild(cache);
+                    }
+                    else {
+                        target.appendChild(element.element);
+                    }
+                }
+                if (element._baseCtx?._inactive && element.isVisible) {
+                    ComponentHelper.activateTree(element);
                 }
             }
-            if (element._baseCtx?._inactive && element.isVisible) {
-                ComponentHelper.activateTree(element);
+            if (this.isDisposed) {
+                return;
             }
-        }
-        if (this.isDisposed) {
-            return;
-        }
-        if (wantsEnterTransition(this)) {
-            const node = this.element;
-            if (node && node.isConnected) {
-                this.motif.options.transition.enterTransition(() => { });
+            if (wantsEnterTransition(this)) {
+                const node = this.element;
+                if (node && node.isConnected) {
+                    this.motif.options.transition.enterTransition(() => { });
+                }
+                else {
+                    const seq = this._base._enterSeq;
+                    queueMicrotask(() => {
+                        if (!this.isDisposed && this.isVisible && this.motif.options?.transition && this._base._enterSeq === seq) {
+                            this.motif.options.transition.enterTransition(() => { });
+                        }
+                    });
+                }
             }
             else {
-                const seq = this._base._enterSeq;
-                queueMicrotask(() => {
-                    if (!this.isDisposed && this.isVisible && this.motif.options?.transition && this._base._enterSeq === seq) {
-                        this.motif.options.transition.enterTransition(() => { });
-                    }
-                });
+                clearNavDirection(this);
             }
-        }
-        else {
-            clearNavDirection(this);
-        }
-        if (building) {
-            try {
-                var target = isFragment ? this.motif.options.cache : this.element;
-                if (target.nodeType === Node.TEXT_NODE) {
-                    target.appendData(ph.textContent);
-                }
-                else {
-                    if (target.appendChild) {
-                        target.appendChild(ph);
+            if (building) {
+                try {
+                    var target = isFragment ? this.motif.options.cache : this.element;
+                    if (target.nodeType === Node.TEXT_NODE) {
+                        target.appendData(ph.textContent);
                     }
                     else {
-                        target.append(ph);
+                        if (target.appendChild) {
+                            target.appendChild(ph);
+                        }
+                        else {
+                            target.append(ph);
+                        }
                     }
                 }
+                catch (error) {
+                }
             }
-            catch (error) {
+            if (deferredSelectValue.length) {
+                try {
+                    deferredSelectValue.forEach(b => b.activate());
+                }
+                catch { }
             }
-        }
-        if (deferredSelectValue.length) {
-            try {
-                deferredSelectValue.forEach(b => b.activate());
+            if (isFragment) {
+                this.motif.options.closeFragment = dom.createComment("]");
+                this.motif.options.cache.appendChild(this.motif.options.closeFragment);
+                if (this.element.nodeType === Node.COMMENT_NODE && this.motif.options.closeFragment) {
+                    fragmentCloseMarkers.set(this.element, this.motif.options.closeFragment);
+                }
             }
-            catch { }
+            this.isBuilt = true;
+            ComponentHelper.callBuilt(this);
+            ComponentHelper.scheduleMounted(this);
         }
-        if (isFragment) {
-            this.motif.options.closeFragment = dom.createComment("]");
-            this.motif.options.cache.appendChild(this.motif.options.closeFragment);
-            if (this.element.nodeType === Node.COMMENT_NODE && this.motif.options.closeFragment) {
-                fragmentCloseMarkers.set(this.element, this.motif.options.closeFragment);
-            }
+        finally {
+            this._flags &= ~F_BUILDING;
         }
-        this.isBuilt = true;
-        ComponentHelper.callBuilt(this);
-        ComponentHelper.scheduleMounted(this);
     }
     setState() {
         this.controls.forEach(c => {
@@ -6334,7 +6538,7 @@ class ComponentBase extends Disposable {
                     callReported(() => cb.length <= 1 ? cb(ev) : cb(this, ev), 'MJX122', 'x:mounted');
                 });
                 if (stop) {
-                    sub = this._register(disposableCore.toDisposable(stop));
+                    sub = this._register(trackedCleanup(stop));
                     const subs = this._base._mountedSubs ??= new Map();
                     let set = subs.get(cb);
                     if (!set) {
@@ -6819,17 +7023,6 @@ function ParseProps(props, component) {
                 applyTransitionProp(props[key], component);
                 delete props[key];
             }
-            else if (componentMethods.hasOwnProperty(key.toLowerCase()) || componentMethods.hasOwnProperty("on" + key.toLowerCase())) {
-                var eventKey;
-                if (!key.toLowerCase().startsWith("on") && key.toLowerCase() !== "initializecomponent") {
-                    eventKey = "on" + key;
-                }
-                else {
-                    eventKey = key;
-                }
-                component[eventKey] = props[key];
-                delete props[key];
-            }
             else if (key.startsWith("on")) {
                 component.motif.on(key, props[key]);
             }
@@ -7065,22 +7258,6 @@ function applyFallthroughProps(props, component) {
     if (subset)
         applyPlainElementProps(subset, component);
 }
-const componentMethods = {
-    "oninitializecomponent": (sender, e) => { },
-    "initializecomponent": (sender, e) => { },
-    "onconfigured": (sender, e) => { },
-    "onconfig": (sender, e) => { },
-    "onbuilding": (sender, e) => { },
-    "onbuilt": (sender, e) => { },
-    "onmounted": (sender, e) => { },
-    "oninitializing": (sender, e) => { },
-    "oninitialized": (sender, e) => { },
-    "ondisposing": (sender, e) => { },
-    "ondisposed": (sender, e) => { },
-    "onvisibilitychanged": (sender, e) => { },
-    "ondeactivated": (sender, e) => { },
-    "onactivated": (sender, e) => { },
-};
 function findAppendableComponent(component) {
     return safeCall(() => {
         if (!component || component.isDisposed)
@@ -7689,7 +7866,7 @@ class ControlCollection {
             this.items.splice(index, 0, control);
         }
         else {
-            this.items.push(control);
+            pushTight(this.items, control);
         }
         control.parent = this.owner;
         const pendingLeave = control.__pendingLeave;
@@ -7716,7 +7893,7 @@ class ControlCollection {
     remove(control) {
         var index = this.items.indexOf(control);
         if (index > -1) {
-            this.items.splice(index, 1);
+            takeAt(this.items, index);
             try {
                 control.dispose();
             }
@@ -7727,10 +7904,10 @@ class ControlCollection {
         const index = this.items.indexOf(control);
         if (index === -1)
             return Promise.resolve();
-        this.items.splice(index, 1);
+        takeAt(this.items, index);
         if (control.isDisposed)
             return Promise.resolve();
-        control._leaveContainer = this.owner;
+        setLeaveContainer(control, this.owner);
         control.parent = null;
         return runLeaveThenDetach(control, () => { if (this.onRemove)
             this.onRemove(control); });
@@ -7743,7 +7920,7 @@ class ControlCollection {
         const index = this.items.indexOf(control);
         if (index === -1)
             return;
-        this.items.splice(index, 1);
+        takeAt(this.items, index);
         if (control.isDisposed)
             return;
         control.parent = null;
@@ -7759,8 +7936,8 @@ class ControlCollection {
         const index = this.items.indexOf(control);
         if (index === -1)
             return;
-        this.items.splice(index, 1);
-        control._leaveContainer = this.owner;
+        takeAt(this.items, index);
+        setLeaveContainer(control, this.owner);
         control.parent = null;
     }
     async clearAsync() {
@@ -7852,6 +8029,12 @@ class ControlCollection {
     }
 }
 /** Owner için DOM'a eklenebilir gerçek element'i bulur. */
+function takeAt(items, index) {
+    if (index === 0)
+        items.shift();
+    else
+        items.splice(index, 1);
+}
 function findAppendableElement(owner) {
     let c = owner;
     while (c) {
@@ -8095,7 +8278,7 @@ function Lazy(props) {
         catch { }
     };
     try {
-        frame.motif.register(disposableCore.toDisposable(() => clearAllTimers()));
+        frame.motif.register(trackedCleanup(() => clearAllTimers()));
     }
     catch { }
     const initial = opts.Placeholderview ?? opts.Loaderview;
@@ -8147,7 +8330,7 @@ function Lazy(props) {
     const retry = normalizeRetry(opts.retry);
     const cleanups = new Set();
     try {
-        frame.motif.register(disposableCore.toDisposable(() => { cleanups.forEach(c => { try {
+        frame.motif.register(trackedCleanup(() => { cleanups.forEach(c => { try {
             c();
         }
         catch { } }); cleanups.clear(); }));
@@ -9302,62 +9485,6 @@ function lintRoutes(routes) {
         visit(r, '', 0);
 }
 
-let overlayHost = null;
-let visible = false;
-function render() {
-    return;
-    // if (!overlayHost) return;
-    // const warnings = getWarnings();
-    // const bar = document.createElement('div');
-    // bar.style.cssText = 'display:flex; align-items:center; gap:8px; padding:6px 8px; background:#111; color:#fff; border-bottom:1px solid #333;';
-    // const title = document.createElement('div');
-    // title.style.fontWeight = '600';
-    // const closeBtn = document.createElement('button');
-    // closeBtn.style.cssText = 'margin-left:auto; background:#333; color:#fff; border:0; padding:2px 6px; cursor:pointer;';
-    // const list = document.createElement('div');
-    // list.style.cssText = 'max-height:40vh; overflow:auto; padding:8px; background:#181818; color:#ddd; font:12px/1.4 monospace;';
-    // for (const w of warnings) {
-    //     const item = document.createElement('div');
-    //     item.style.cssText = 'padding:6px 8px; border:1px solid #333; border-radius:4px; margin-bottom:6px; background:#1f1f1f;';
-    //     const code = document.createElement('div');
-    //     code.style.cssText = 'color:#ffb86c; font-weight:700;';
-    //     const msg = document.createElement('div');
-    //     const det = document.createElement('pre');
-    //     det.textContent = w.details ? JSON.stringify(w.details, null, 2) : '';
-    //     det.style.cssText = 'white-space:pre-wrap; color:#aaa; margin:6px 0 0 0;';
-    //     if (w.details) item.appendChild(det);
-}
-function toggle(force) {
-    if (!overlayHost)
-        return;
-    visible = !visible;
-    overlayHost.style.display = visible ? 'block' : 'none';
-}
-function initOverlayIfEnabled() {
-    ensureDevtoolsFlagInitialized();
-    if (!isRequestedByFlag())
-        return;
-    try {
-        if (!overlayHost) {
-            overlayHost = document.createElement('div');
-            overlayHost.style.cssText = 'position:fixed; left:12px; bottom:12px; right:12px; z-index:2147483647; background:#111; color:#fff; border:1px solid #333; border-radius:8px; box-shadow:0 4px 14px rgba(0,0,0,0.4); display:none;';
-            document.body.appendChild(overlayHost);
-            window.addEventListener('keydown', (e) => {
-                try {
-                    if ((e.ctrlKey || e.metaKey) && e.key === '`') {
-                        e.preventDefault();
-                        toggle();
-                    }
-                }
-                catch { }
-            });
-            on((ev) => { if (ev.type === 'warning' && visible)
-                render(); });
-        }
-    }
-    catch { }
-}
-
 class RouterViewRegistry {
     static { this.outlets = new Map(); }
     static register(name, scopeId, instance) {
@@ -11533,6 +11660,12 @@ class UrlRoutingModule {
         const w = window;
         return this._routerOptions.mode || (w?.location?.protocol === 'file:' ? 'hash' : 'history');
     }
+    addressOf(uri) {
+        const mode = this._addressMode();
+        if (mode === 'hash' || mode === 'file')
+            return uri.startsWith('#') ? uri : '#' + uri;
+        return uri;
+    }
     _readHistoryStamp() {
         try {
             const state = window?.history?.state;
@@ -11667,7 +11800,7 @@ class UrlRoutingModule {
         this._pendingTraversal = null;
         return await safeCallSilentAsync(async () => {
             try {
-                globalThis.__MOTIF_DEVTOOLS_BUS__?.publish?.('route:navigation-start', { uri });
+                devtools()?.('route:navigation-start', { uri });
             }
             catch { }
             const suppressBeforeEachThisCall = this._suppressBeforeEachOnce;
@@ -11851,7 +11984,7 @@ class UrlRoutingModule {
                 state: entryState
             });
             try {
-                globalThis.__MOTIF_DEVTOOLS_BUS__?.publish?.('route:navigation-end', { uri: appliedPath, params: target.params });
+                devtools()?.('route:navigation-end', { uri: appliedPath, params: target.params });
             }
             catch { }
             return target;
@@ -12481,6 +12614,7 @@ class Application {
     get state() {
         return this._state;
     }
+    _addressOf(uri) { return this.urlRoutingModule?.addressOf(uri) ?? uri; }
     static CreateBuilder() {
         return new ApplicationBuilder();
     }
@@ -12660,10 +12794,8 @@ class Application {
         this.urlRoutingModule = new UrlRoutingModule(this._routerConfig, this);
         this._routerState.reset();
         safeCallSilent(() => {
-            ensureDevtoolsFlagInitialized();
-            initOverlayIfEnabled();
             setRoutes(routes);
-            if (this._isDevelopment || globalThis.__MOTIF_DEV__ === true || isEnabled()) {
+            if (this._isDevelopment || globalThis.__MOTIF_DEV__ === true) {
                 lintRoutes(routes);
             }
         }, 'Application.useRouter.devtools');
@@ -12890,4 +13022,4 @@ exports.untracked = untracked;
 exports.useApplication = useApplication;
 exports.useModel = useModel;
 exports.useNavigation = useNavigation;
-//# sourceMappingURL=core-ZMoM1273.cjs.map
+//# sourceMappingURL=core-ZhqTS1zK.cjs.map