@rdlabo/ionic-theme-ios27 0.1.0 → 0.2.1-beta.pr185.sha0793981f6cf4

package/src/native/components/searchable-tabs.ts

@@ -25,7 +25,55 @@ interface SearchState {
 export const createSearchSupport = (doc: Document, id: (element: Element) => string, schedule: () => void) => {
   const states = new Map<NativeSearchBinding, SearchState>();
   let keyboardVisible = false;
+  let heldKeyboardResize: string | null = null;
+  let keyboardResizeGeneration = 0;
+  type KeyboardPlugin = {
+    setResizeMode?: (options: { mode: string }) => Promise<void>;
+    getResizeMode?: () => Promise<{ mode?: string }>;
+  };
+  const keyboardPlugin = (): KeyboardPlugin | undefined =>
+    (
+      doc.defaultView as Window & {
+        Capacitor?: { Plugins?: { Keyboard?: KeyboardPlugin } };
+      }
+    )?.Capacitor?.Plugins?.Keyboard;
   const projected = (binding: NativeSearchBinding) => binding.footer.hasAttribute(marker);
+  // Hold Cap resize at none while search is active so WebView shrink does not fight UISearchTab.
+  const holdKeyboardResize = () => {
+    const keyboard = keyboardPlugin();
+    if (!keyboard?.setResizeMode || heldKeyboardResize !== null) return;
+    const setResizeMode = keyboard.setResizeMode.bind(keyboard);
+    const generation = ++keyboardResizeGeneration;
+    heldKeyboardResize = 'native';
+    void (async () => {
+      let restoreMode = 'native';
+      try {
+        const current = await keyboard.getResizeMode?.();
+        if (typeof current?.mode === 'string') restoreMode = current.mode;
+      } catch {
+        /* keep default restore target */
+      }
+      if (generation !== keyboardResizeGeneration) return;
+      heldKeyboardResize = restoreMode;
+      try {
+        await setResizeMode({ mode: 'none' });
+      } catch {
+        if (generation === keyboardResizeGeneration) heldKeyboardResize = null;
+        return;
+      }
+      // Leave raced ahead of setResizeMode(none) — undo the stale none apply.
+      if (generation !== keyboardResizeGeneration) void setResizeMode({ mode: restoreMode }).catch(() => undefined);
+    })();
+  };
+  const hasActiveProjection = () => [...states.keys()].some((binding) => binding.active && projected(binding));
+  const releaseKeyboardResize = () => {
+    if (hasActiveProjection()) return;
+    keyboardResizeGeneration++;
+    const mode = heldKeyboardResize;
+    heldKeyboardResize = null;
+    if (!mode) return;
+    void keyboardPlugin()?.setResizeMode?.({ mode });
+  };
   const isCurrent = (state: SearchState) =>
     state.bar.isConnected &&
     state.binding.footer.querySelector('ion-searchbar') === state.bar &&
@@ -118,7 +166,10 @@ export const createSearchSupport = (doc: Document, id: (element: Element) => str
   return {
     keyboard(visible: boolean) {
       keyboardVisible = visible;
-      if (!visible) states.forEach((state) => (state.keyboardHidden = false));
+      if (!visible) {
+        states.forEach((state) => (state.keyboardHidden = false));
+        releaseKeyboardResize();
+      }
       schedule();
     },
     keepSearchTabsVisible() {
@@ -142,6 +193,13 @@ export const createSearchSupport = (doc: Document, id: (element: Element) => str
         }
       }
       const inactive: [Candidate, ShellSearch][] = [];
+      const pageHidden = (element: HTMLElement) => !!element.closest('.ion-page-hidden, .ion-page-invisible');
+      const retainInactive = (candidate: Candidate, state?: SearchState, keepAvailable = false) => {
+        // Keep ShellSearchController across page transitions instead of demoting to UITabBar.
+        // While the searchable page is only blocked mid-transition (not yet hidden), keep
+        // available:true so native chrome does not swap to ordinary idleBar over album content.
+        if (state?.last) inactive.push([candidate, { ...state.last, active: false, available: keepAvailable, focused: false }]);
+      };
       for (const binding of bindings) {
         const candidate = candidates.find((c) => c.element === binding.tabBar);
         if (!candidate || candidate.control.search || binding.tabBar.getAttribute('slot') !== 'bottom') continue;
@@ -153,9 +211,37 @@ export const createSearchSupport = (doc: Document, id: (element: Element) => str
         )
           continue;
         if (isShellDisabled(fab) || isShellDisabled(binding.footer)) continue;
-        if (blocked(binding.footer) || !visible(binding.trigger) || binding.footer.closest(excluded)) {
-          const state = states.get(binding);
-          if (state?.last) inactive.push([candidate, { ...state.last, active: false, available: false, focused: false }]);
+        const pageUnavailable = blocked(binding.footer) || !!binding.footer.closest(excluded);
+        const existing = states.get(binding);
+        if (pageUnavailable) {
+          retainInactive(candidate, existing, !!existing?.last?.available && !pageHidden(binding.footer));
+          if (existing?.last) continue;
+          // First registration during a transition: fall through and measure available:false.
+        }
+        if (binding.active && existing && isCurrent(existing) && existing.last && !pageUnavailable) {
+          const back = binding.footer.querySelector<HTMLIonButtonElement>('ion-buttons[slot=start] ion-button');
+          // Close must stay eligible; otherwise fall through and demote instead of caching active.
+          if (back && !back.disabled && !back.closest(excluded)) {
+            candidate.control.search = {
+              ...existing.last,
+              active: true,
+              available: true,
+              focused: binding.focused,
+              value: existing.bar.value ?? '',
+              placeholder: existing.bar.placeholder ?? '',
+              disabled: existing.bar.disabled,
+              editSequence: existing.editSequence,
+              valueVersion: existing.valueVersion,
+            };
+            existing.last = candidate.control.search;
+            candidate.sources = [binding.tabBar, binding.trigger.closest<HTMLElement>('ion-fab') ?? binding.trigger, binding.footer];
+            candidate.actions.set(existing.last.trigger.id, binding.trigger);
+            candidate.actions.set(existing.last.closeId, back);
+            continue;
+          }
+        }
+        if (!visible(binding.trigger) && !pageUnavailable) {
+          retainInactive(candidate, existing);
           continue;
         }
         const bar = binding.footer.querySelector<HTMLIonSearchbarElement>('ion-searchbar');
@@ -168,11 +254,13 @@ export const createSearchSupport = (doc: Document, id: (element: Element) => str
           !binding.footer.matches('ion-footer') ||
           !inFixedToolbar(bar) ||
           !inFixedToolbar(back) ||
-          bar.closest(excluded) ||
+          (!pageUnavailable && bar.closest(excluded)) ||
           !bar.classList.contains('ios') ||
           bar.classList.contains('searchbar-classic')
-        )
+        ) {
+          retainInactive(candidate, existing);
           continue;
+        }
         if (
           bar.color ||
           back.fill !== 'default' ||
@@ -187,14 +275,19 @@ export const createSearchSupport = (doc: Document, id: (element: Element) => str
           bar.spellcheck ||
           bar.showClearButton !== 'always' ||
           bar.clearIcon
-        )
+        ) {
+          retainInactive(candidate, existing);
           continue;
-        if (bar.showCancelButton !== 'never' || bar.type !== 'search' || !getComputedStyle(input).backdropFilter.includes('blur')) continue;
+        }
+        if (bar.showCancelButton !== 'never' || bar.type !== 'search' || !getComputedStyle(input).backdropFilter.includes('blur')) {
+          retainInactive(candidate, existing);
+          continue;
+        }
         const fabButton = binding.trigger as HTMLIonFabButtonElement;
         const nativeTrigger = fabButton.shadowRoot?.querySelector<HTMLElement>('[part=native]');
         if (
-          binding.trigger.closest(excluded) ||
-          back.closest(excluded) ||
+          (!pageUnavailable && binding.trigger.closest(excluded)) ||
+          (!pageUnavailable && back.closest(excluded)) ||
           back.disabled ||
           fabButton.disabled ||
           fabButton.color ||
@@ -203,15 +296,20 @@ export const createSearchSupport = (doc: Document, id: (element: Element) => str
           !nativeTrigger ||
           getComputedStyle(fabButton).backgroundColor !== 'rgba(0, 0, 0, 0)' ||
           !getComputedStyle(nativeTrigger).backdropFilter.includes('blur')
-        )
+        ) {
+          retainInactive(candidate, existing);
           continue;
+        }
+        const state = existing ?? install(binding, bar, input);
         const trigger = readIcon(binding.trigger, binding.trigger, candidate);
         const searchIcon = bar.querySelector<HTMLElement>('.searchbar-search-icon');
         const field = searchIcon && readIcon(searchIcon, bar, candidate);
-        if (!trigger || !field) continue;
+        if (!trigger || !field) {
+          retainInactive(candidate, state);
+          continue;
+        }
         field.label = '';
         field.accessibilityLabel = bar.getAttribute('aria-label') ?? input.getAttribute('aria-label') ?? 'Search';
-        const state = states.get(binding) ?? install(binding, bar, input);
         state.layout = JSON.stringify([
           innerWidth,
           innerHeight,
@@ -231,15 +329,19 @@ export const createSearchSupport = (doc: Document, id: (element: Element) => str
           bar.placeholder,
           bar.disabled,
         ]);
-        if (state.rejectedLayout === state.layout) continue;
+        if (state.rejectedLayout === state.layout) {
+          retainInactive(candidate, state);
+          continue;
+        }
+        const available = !pageUnavailable && visible(binding.trigger);
         candidate.control.search = {
           id: id(input),
           field,
           trigger,
           closeId: id(back),
-          active: binding.active,
-          available: true,
-          focused: binding.focused,
+          active: available && binding.active,
+          available,
+          focused: available && binding.focused,
           value: bar.value ?? '',
           placeholder: bar.placeholder ?? '',
           disabled: bar.disabled,
@@ -247,19 +349,36 @@ export const createSearchSupport = (doc: Document, id: (element: Element) => str
           valueVersion: state.valueVersion,
         };
         state.last = candidate.control.search;
-        candidate.sources = [binding.tabBar, binding.trigger.closest<HTMLElement>('ion-fab') ?? binding.trigger, binding.footer];
-        candidate.actions.set(id(binding.trigger), binding.trigger);
-        candidate.actions.set(id(back), back);
+        if (available) {
+          candidate.sources = [binding.tabBar, binding.trigger.closest<HTMLElement>('ion-fab') ?? binding.trigger, binding.footer];
+          candidate.actions.set(id(binding.trigger), binding.trigger);
+          candidate.actions.set(id(back), back);
+        }
       }
       for (const [candidate, configuration] of inactive) candidate.control.search ??= configuration;
       const groups = candidates.filter((c) => c.control.search);
       return candidates.filter((c) => !groups.some((group) => group !== c && group.sources?.some((source) => source.contains(c.element))));
     },
     projected,
+    hasActive() {
+      for (const [binding] of states) if (binding.active && projected(binding)) return true;
+      return false;
+    },
     begin(binding: NativeSearchBinding, revision: number) {
       const state = states.get(binding);
       if (state) state.minimumRevision = revision;
     },
+    /** Enter / focus / leave. `focused` is ignored when leaving. */
+    setStatus(binding: NativeSearchBinding, active: boolean, focused = false) {
+      if (!active) {
+        this.retire(binding);
+        return;
+      }
+      binding.active = true;
+      // Projection intent only. Ionic focus/blur events still wait for the native phase.
+      binding.focused = focused;
+      holdKeyboardResize();
+    },
     release(element: HTMLElement) {
       for (const binding of states.keys()) if (binding.footer === element) this.retire(binding);
     },
@@ -267,8 +386,7 @@ export const createSearchSupport = (doc: Document, id: (element: Element) => str
       states.forEach((state) => {
         if (ids.includes(id(state.binding.tabBar))) {
           state.rejectedLayout = state.layout;
-          // A rejected search surface has been removed by UIKit. Do not reuse its
-          // cached configuration on an inactive page; project ordinary tabs instead.
+          // UIKit removed the search surface — do not reuse its cache; project ordinary tabs.
           state.last = undefined;
         }
       });
@@ -319,6 +437,7 @@ export const createSearchSupport = (doc: Document, id: (element: Element) => str
         state.input.dispatchEvent(new FocusEvent('blur'));
       }
       binding.active = binding.focused = false;
+      releaseKeyboardResize();
     },
     destroy() {
       states.forEach((state) => {
@@ -326,6 +445,7 @@ export const createSearchSupport = (doc: Document, id: (element: Element) => str
         state.restore();
       });
       states.clear();
+      releaseKeyboardResize();
     },
   };
 };

package/src/native/definitions.ts

@@ -10,11 +10,38 @@ export interface NativeUIShellStatus {
   reason?: string;
 }
 
+export interface NativeUIShellOptions {
+  /** Enables Native UI Shell globally. Defaults to `true`. */
+  enabled?: boolean;
+  /** Controls eligible for native projection. Omit to enable every control; when present, only `true` controls are enabled. */
+  controls?: NativeUIShellControls;
+}
+
+export interface NativeUIShellControls {
+  /** Projects tab bars and their native search presentation. */
+  tabs?: boolean;
+  /** Projects toolbar buttons, including back and menu buttons. */
+  toolbar?: boolean;
+  /** Projects segments. */
+  segment?: boolean;
+  /** Projects floating action buttons. */
+  fab?: boolean;
+}
+
 export interface NativeUIShellHandle {
+  /** Returns the current Web/native projection state. */
   getStatus(): NativeUIShellStatus;
+  /** Restores projected controls to the Web until the returned lease is resumed. */
+  suspend(): Promise<NativeUIShellSuspension>;
+  /** Stops synchronization, restores Web controls and releases native resources. */
   destroy(): Promise<void>;
 }
 
+export interface NativeUIShellSuspension {
+  /** Releases this suspension. Native projection resumes after all active suspensions are released. */
+  resume(): Promise<void>;
+}
+
 export interface Frame {
   x: number;
   y: number;
@@ -98,10 +125,17 @@ export interface ShellActivation {
   sequence: number;
 }
 
+export interface WebViewMetrics {
+  /** The WebView's effective top-left corner radius in points, or `0` when unavailable. */
+  radius: number;
+}
+
 export interface NativeUIShellPlugin {
   configure(): Promise<{ supported: boolean }>;
+  getWebViewMetrics(): Promise<WebViewMetrics>;
   update(snapshot: ShellSnapshot): Promise<{ revision: number; rejectedSearches?: string[]; rejectedControls?: string[] }>;
   clear(options: { revision: number }): Promise<void>;
   addListener(name: 'activate', listener: (event: ShellActivation) => void): Promise<PluginListenerHandle>;
   addListener(name: 'search', listener: (event: ShellSearchEvent) => void): Promise<PluginListenerHandle>;
+  addListener(name: 'webViewMetricsChange', listener: (event: WebViewMetrics) => void): Promise<PluginListenerHandle>;
 }

package/src/native/index.ts

@@ -1,32 +1,59 @@
 import { Capacitor, registerPlugin } from '@capacitor/core';
-import type { NativeUIShellHandle, NativeUIShellPlugin } from './definitions';
+import { setConfig } from '../transition/ios.transition';
+import type { NativeUIShellHandle, NativeUIShellOptions, NativeUIShellPlugin, WebViewMetrics } from './definitions';
+import { bindMetricsLifecycle } from './lifecycle';
 import { createRuntime } from './runtime';
-export type { NativeUIShellComponent, NativeUIShellHandle, NativeUIShellStatus } from './definitions';
+export type {
+  NativeUIShellComponent,
+  NativeUIShellControls,
+  NativeUIShellHandle,
+  NativeUIShellOptions,
+  NativeUIShellStatus,
+  NativeUIShellSuspension,
+  WebViewMetrics,
+} from './definitions';
 
 const plugin = registerPlugin<NativeUIShellPlugin>('IonicNativeUIShell');
 let active: Promise<NativeUIShellHandle> | undefined;
 const web = (reason: string): NativeUIShellHandle => ({
   getStatus: () => ({ state: 'web', projected: 0, updates: 0, reason }),
+  suspend: async () => ({ resume: async () => {} }),
   destroy: async () => {},
 });
 
+/** Reads the current native WebView geometry and applies it to page transitions. */
+export const configureNativeTransition = async (): Promise<WebViewMetrics> => {
+  const metrics = typeof document !== 'undefined' && Capacitor.getPlatform() === 'ios' ? await plugin.getWebViewMetrics() : { radius: 0 };
+  setConfig({ radius: metrics.radius });
+  return metrics;
+};
+
 /** Call once at application startup. Ionic markup remains the source of truth. */
-export const enableNativeUIShell = (): Promise<NativeUIShellHandle> => {
+export const enableNativeUIShell = (options: NativeUIShellOptions = {}): Promise<NativeUIShellHandle> => {
+  if (options.enabled === false) {
+    const current = active;
+    active = undefined;
+    return current
+      ? current.then(async (handle) => {
+          await handle.destroy();
+          return web('Disabled');
+        })
+      : Promise.resolve(web('Disabled'));
+  }
   if (typeof document === 'undefined' || Capacitor.getPlatform() !== 'ios') return Promise.resolve(web('Requires Capacitor iOS'));
   return (active ??= (async () => {
     try {
+      await configureNativeTransition().catch(() => undefined);
       if (!(await plugin.configure()).supported) {
         active = undefined;
         return web('Requires iOS 26 or later');
       }
-      const runtime = await createRuntime(document, plugin);
-      return {
-        getStatus: runtime.getStatus,
-        async destroy() {
-          await runtime.destroy();
-          active = undefined;
-        },
-      };
+      const runtime = await createRuntime(document, plugin, options);
+      return await bindMetricsLifecycle(
+        runtime,
+        () => plugin.addListener('webViewMetricsChange', (metrics) => setConfig({ radius: metrics.radius })),
+        () => (active = undefined),
+      );
     } catch (error) {
       active = undefined;
       return web(error instanceof Error ? error.message : String(error));

package/src/native/lifecycle.ts

@@ -0,0 +1,38 @@
+import type { PluginListenerHandle } from '@capacitor/core';
+import type { NativeUIShellHandle } from './definitions';
+
+export const bindMetricsLifecycle = async (
+  runtime: NativeUIShellHandle,
+  listen: () => Promise<PluginListenerHandle>,
+  deactivate: () => void,
+): Promise<NativeUIShellHandle> => {
+  let listener: PluginListenerHandle;
+  try {
+    listener = await listen();
+  } catch (error) {
+    await runtime.destroy();
+    throw error;
+  }
+
+  let destroying: Promise<void> | undefined;
+  return {
+    getStatus: runtime.getStatus,
+    suspend: runtime.suspend,
+    destroy() {
+      return (destroying ??= (async () => {
+        let removalError: unknown;
+        try {
+          await listener.remove();
+        } catch (error) {
+          removalError = error;
+        }
+        try {
+          await runtime.destroy();
+        } finally {
+          deactivate();
+        }
+        if (removalError) throw removalError;
+      })());
+    },
+  };
+};

package/src/native/runtime.ts

@@ -2,7 +2,14 @@ import type { PluginListenerHandle } from '@capacitor/core';
 import { LIFECYCLE_WILL_ENTER, LIFECYCLE_WILL_LEAVE, LIFECYCLE_DID_ENTER, LIFECYCLE_DID_LEAVE } from '@ionic/core';
 import { getNativeSearchBindings, setNativeUIShellIntegration } from '../native-integration';
 import { createSearchSupport } from './components/searchable-tabs';
-import type { ShellActivation, ShellSnapshot, NativeUIShellHandle, NativeUIShellPlugin, NativeUIShellStatus } from './definitions';
+import type {
+  ShellActivation,
+  ShellSnapshot,
+  NativeUIShellHandle,
+  NativeUIShellOptions,
+  NativeUIShellPlugin,
+  NativeUIShellStatus,
+} from './definitions';
 import { readCandidate, selector, shadowSelector, motionSelector } from './components';
 import { marker, unprojected } from './shared/dom';
 import { createIconRenderer } from './shared/icons';
@@ -20,7 +27,11 @@ const bounded = <T>(promise: Promise<T>): Promise<T> =>
     promise.then(resolve, reject).finally(() => clearTimeout(timer));
   });
 
-export const createRuntime = async (doc: Document, plugin: NativeUIShellPlugin): Promise<NativeUIShellHandle> => {
+export const createRuntime = async (
+  doc: Document,
+  plugin: NativeUIShellPlugin,
+  options: NativeUIShellOptions = {},
+): Promise<NativeUIShellHandle> => {
   const win = doc.defaultView!;
   const icons = createIconRenderer();
   const crossfade = createCrossfade(win);
@@ -30,6 +41,7 @@ export const createRuntime = async (doc: Document, plugin: NativeUIShellPlugin):
   const suspended = new Set<HTMLElement[]>();
   const pages = new Set<HTMLElement>();
   const presented = new Set<HTMLElement>();
+  const manualSuspensions = new Set<symbol>();
   const moving = new Map<HTMLElement, Set<string>>();
   const observed = new Set<Element | ShadowRoot>();
   const listeners = new AbortController();
@@ -52,6 +64,16 @@ export const createRuntime = async (doc: Document, plugin: NativeUIShellPlugin):
   let listener: PluginListenerHandle | undefined;
   let searchListener: PluginListenerHandle | undefined;
   let waiters: (() => void)[] = [];
+  const control = (kind: Candidate['control']['kind']): keyof NonNullable<NativeUIShellOptions['controls']> => {
+    if (kind === 'ion-tab-bar') return 'tabs';
+    if (kind === 'ion-segment') return 'segment';
+    if (kind === 'ion-fab') return 'fab';
+    return 'toolbar';
+  };
+  const controlEnabled = (candidate: Candidate) => {
+    const controls = options.controls;
+    return controls === undefined || controls[control(candidate.control.kind)] === true;
+  };
   const id = (element: Element) => {
     let value = ids.get(element);
     if (!value) {
@@ -91,6 +113,10 @@ export const createRuntime = async (doc: Document, plugin: NativeUIShellPlugin):
   };
   const search = createSearchSupport(doc, id, schedule);
   const candidateSources = (candidate: Candidate) => candidate.sources ?? [candidate.element];
+  const readEnabledCandidate = (element: HTMLElement): Candidate | undefined => {
+    const candidate = readCandidate(element, id);
+    return candidate && controlEnabled(candidate) ? candidate : undefined;
+  };
   const flush = async () => {
     if (stopped) return;
     schedule();
@@ -108,6 +134,7 @@ export const createRuntime = async (doc: Document, plugin: NativeUIShellPlugin):
   const overlayOpen = () => {
     for (const element of presented) if (!element.isConnected) presented.delete(element);
     return (
+      manualSuspensions.size > 0 ||
       presented.size > 0 ||
       Array.from(doc.querySelectorAll(overlays)).some(
         (element) => (element as Element & { presented?: boolean }).presented || element.classList.contains('show-menu'),
@@ -121,14 +148,14 @@ export const createRuntime = async (doc: Document, plugin: NativeUIShellPlugin):
     search.keepSearchTabsVisible();
     for (const page of pages) if (!page.isConnected) pages.delete(page);
     for (const surface of moving.keys()) if (!surface.isConnected) moving.delete(surface);
-    if (doc.hidden || overlayOpen() || (win.visualViewport && (win.visualViewport.scale !== 1 || win.visualViewport.offsetTop !== 0)))
-      return [];
+    if (doc.hidden || overlayOpen()) return [];
+    if (win.visualViewport && (win.visualViewport.scale !== 1 || win.visualViewport.offsetTop !== 0) && !search.hasActive()) return [];
     return unprojected(sources.keys(), () =>
       search
         .decorate(
           Array.from(doc.querySelectorAll<HTMLElement>(selector))
             .filter((element) => !blocked(element))
-            .map((element) => readCandidate(element, id))
+            .map(readEnabledCandidate)
             .filter((candidate): candidate is Candidate => !!candidate),
           blocked,
         )
@@ -219,6 +246,7 @@ export const createRuntime = async (doc: Document, plugin: NativeUIShellPlugin):
       }
       if (result.rejectedSearches?.length) {
         search.reject(result.rejectedSearches);
+        lastSnapshot = '';
         dirty = true;
       }
       for (const candidate of candidates) {
@@ -375,6 +403,23 @@ export const createRuntime = async (doc: Document, plugin: NativeUIShellPlugin):
       updates,
       reason,
     }),
+    async suspend() {
+      const token = Symbol();
+      let resumed = false;
+      if (!stopped) {
+        manualSuspensions.add(token);
+        getNativeSearchBindings(doc).forEach((binding) => search.retire(binding));
+        await flush();
+      }
+      return {
+        async resume() {
+          if (resumed) return;
+          resumed = true;
+          if (stopped || !manualSuspensions.delete(token)) return;
+          await flush();
+        },
+      };
+    },
     async destroy() {
       if (stopped) return;
       stopped = true;
@@ -399,6 +444,7 @@ export const createRuntime = async (doc: Document, plugin: NativeUIShellPlugin):
       icons.clear();
       pages.clear();
       presented.clear();
+      manualSuspensions.clear();
       moving.clear();
       suspended.clear();
       await listener?.remove().catch(() => {});
@@ -427,7 +473,7 @@ export const createRuntime = async (doc: Document, plugin: NativeUIShellPlugin):
     if (!element) return;
     const owner = Array.from(sources.keys()).find((source) => source === element || source.contains(element));
     if (!owner) return;
-    const direct = !blocked(owner) && unprojected(sources.keys(), () => readCandidate(owner, id));
+    const direct = !blocked(owner) && unprojected(sources.keys(), () => readEnabledCandidate(owner));
     const candidate = direct || read().find((candidate) => candidate.actions.has(event.id));
     const item = candidate?.control.items.find((item) => item.id === event.id);
     const searchAction =
@@ -451,10 +497,14 @@ export const createRuntime = async (doc: Document, plugin: NativeUIShellPlugin):
     setNativeUIShellIntegration(doc, {
       async search(binding, active, focus) {
         if (!getNativeSearchBindings(doc).includes(binding) || !search.projected(binding)) return false;
-        if (active && !binding.active) search.begin(binding, revision + 1);
-        binding.active = active;
-        binding.focused = focus ?? (active && binding.focused);
-        if (!active) search.retire(binding);
+        if (!active) {
+          search.setStatus(binding, false);
+        } else {
+          const entering = !binding.active;
+          if (entering) search.begin(binding, revision + 1);
+          const nextFocused = focus === true ? true : focus === false ? false : entering ? false : binding.focused;
+          search.setStatus(binding, true, nextFocused);
+        }
         await flush();
         return !stopped && search.projected(binding);
       },