Improvement: Add base definition for recently used sections.

NiffirgkcaJ · NiffirgkcaJ · commit 71d30764c1e6 · 2026-06-14T10:45:00.000+08:00
diff --git a/gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionClipboard.js b/gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionClipboard.js
@@ -2,6 +2,7 @@ import { GlobalActionService } from '../../../shared/services/serviceAction.js';
 import { searchViaProvider } from '../../../shared/services/serviceSearchHub.js';
 
 import { RecentlyUsedDefaultPolicy } from '../constants/recentlyUsedPolicyConstants.js';
+import { RecentlyUsedSectionDefinition } from '../registry/recentlyUsedSectionDefinition.js';
 import { renderRecentlyUsedClipboardListContent } from '../integrations/recentlyUsedIntegrationClipboard.js';
 
 import { ClipboardProvider } from '../../Clipboard/constants/clipboardConstants.js';
@@ -14,7 +15,7 @@ import { ensureClipboardSearchProviderRegistered } from '../../Clipboard/integra
  * @returns {object} Clipboard section definition instance.
  */
 function createRecentlyUsedDefinitionClipboardInstance() {
-    const definition = {
+    const definition = new RecentlyUsedSectionDefinition({
         id: 'clipboard',
         targetTab: 'Clipboard',
         layoutType: 'list',
@@ -37,7 +38,7 @@ function createRecentlyUsedDefinitionClipboardInstance() {
             },
         },
         gridPresentation: null,
-    };
+    });
 
     /**
      * Initializes the clipboard section.
diff --git a/gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionEmoji.js b/gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionEmoji.js
@@ -2,6 +2,7 @@ import { GlobalActionService } from '../../../shared/services/serviceAction.js';
 import { searchViaProvider } from '../../../shared/services/serviceSearchHub.js';
 
 import { RecentlyUsedDefaultPolicy } from '../constants/recentlyUsedPolicyConstants.js';
+import { RecentlyUsedSectionDefinition } from '../registry/recentlyUsedSectionDefinition.js';
 import { setRecentlyUsedClipboardText } from '../integrations/recentlyUsedIntegrationClipboard.js';
 import { createRecentlyUsedRecentsManager, resolveRecentlyUsedRecentFilePath } from '../integrations/recentlyUsedIntegrationRecents.js';
 
@@ -18,7 +19,7 @@ function createRecentlyUsedDefinitionEmojiInstance() {
     let recentManager = null;
     let emojiSearchRenderer = null;
 
-    const definition = {
+    const definition = new RecentlyUsedSectionDefinition({
         id: 'emoji',
         targetTab: 'Emoji',
         layoutType: 'grid',
@@ -35,7 +36,7 @@ function createRecentlyUsedDefinitionEmojiInstance() {
             icon: null,
         },
         listPresentation: null,
-    };
+    });
 
     /**
      * Initializes the emoji recents manager.
diff --git a/gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionGif.js b/gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionGif.js
@@ -7,6 +7,7 @@ import { searchViaProvider } from '../../../shared/services/serviceSearchHub.js'
 
 import { matchesRecentlyUsedSearch } from '../utilities/recentlyUsedSearch.js';
 import { RecentlyUsedDefaultPolicy } from '../constants/recentlyUsedPolicyConstants.js';
+import { RecentlyUsedSectionDefinition } from '../registry/recentlyUsedSectionDefinition.js';
 import { createRecentlyUsedRecentsManager, resolveRecentlyUsedRecentFilePath } from '../integrations/recentlyUsedIntegrationRecents.js';
 import { getRecentlyUsedGifRuntime, destroyRecentlyUsedGifRuntime, copyRecentlyUsedGifToClipboard } from '../integrations/recentlyUsedIntegrationGif.js';
 
@@ -26,7 +27,7 @@ const GIF_PLACEHOLDER = {
 function createRecentlyUsedDefinitionGifInstance() {
     let recentManager = null;
 
-    const definition = {
+    const definition = new RecentlyUsedSectionDefinition({
         id: 'gif',
         targetTab: 'GIF',
         layoutType: 'grid',
@@ -45,7 +46,7 @@ function createRecentlyUsedDefinitionGifInstance() {
             },
         },
         listPresentation: null,
-    };
+    });
 
     /**
      * Initializes GIF recents and runtime services.
diff --git a/gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionKaomoji.js b/gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionKaomoji.js
@@ -2,6 +2,7 @@ import { GlobalActionService } from '../../../shared/services/serviceAction.js';
 import { searchViaProvider } from '../../../shared/services/serviceSearchHub.js';
 
 import { RecentlyUsedDefaultPolicy } from '../constants/recentlyUsedPolicyConstants.js';
+import { RecentlyUsedSectionDefinition } from '../registry/recentlyUsedSectionDefinition.js';
 import { setRecentlyUsedClipboardText } from '../integrations/recentlyUsedIntegrationClipboard.js';
 import { createRecentlyUsedRecentsManager, resolveRecentlyUsedRecentFilePath } from '../integrations/recentlyUsedIntegrationRecents.js';
 
@@ -18,7 +19,7 @@ function createRecentlyUsedDefinitionKaomojiInstance() {
     let recentManager = null;
     let kaomojiSearchRenderer = null;
 
-    const definition = {
+    const definition = new RecentlyUsedSectionDefinition({
         id: 'kaomoji',
         targetTab: 'Kaomoji',
         layoutType: 'list',
@@ -41,7 +42,7 @@ function createRecentlyUsedDefinitionKaomojiInstance() {
             },
         },
         gridPresentation: null,
-    };
+    });
 
     /**
      * Initializes the kaomoji recents manager.
diff --git a/gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionPinned.js b/gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionPinned.js
@@ -1,6 +1,7 @@
 import { GlobalActionService } from '../../../shared/services/serviceAction.js';
 import { searchViaProvider } from '../../../shared/services/serviceSearchHub.js';
 
+import { RecentlyUsedSectionDefinition } from '../registry/recentlyUsedSectionDefinition.js';
 import { RecentlyUsedUI } from '../constants/recentlyUsedConstants.js';
 import { renderRecentlyUsedClipboardListContent } from '../integrations/recentlyUsedIntegrationClipboard.js';
 import { RecentlyUsedDefaultPolicy, RecentlyUsedLimitMode } from '../constants/recentlyUsedPolicyConstants.js';
@@ -15,7 +16,7 @@ import { ensureClipboardSearchProviderRegistered } from '../../Clipboard/integra
  * @returns {object} Pinned section definition instance.
  */
 function createRecentlyUsedDefinitionPinnedInstance() {
-    const definition = {
+    const definition = new RecentlyUsedSectionDefinition({
         id: 'pinned',
         targetTab: 'Clipboard',
         layoutType: 'list',
@@ -51,7 +52,7 @@ function createRecentlyUsedDefinitionPinnedInstance() {
             },
         },
         gridPresentation: null,
-    };
+    });
 
     /**
      * Initializes the pinned section.
diff --git a/gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionSymbols.js b/gnome-extensions/extension/features/RecentlyUsed/definitions/recentlyUsedDefinitionSymbols.js
@@ -2,6 +2,7 @@ import { GlobalActionService } from '../../../shared/services/serviceAction.js';
 import { searchViaProvider } from '../../../shared/services/serviceSearchHub.js';
 
 import { RecentlyUsedDefaultPolicy } from '../constants/recentlyUsedPolicyConstants.js';
+import { RecentlyUsedSectionDefinition } from '../registry/recentlyUsedSectionDefinition.js';
 import { setRecentlyUsedClipboardText } from '../integrations/recentlyUsedIntegrationClipboard.js';
 import { createRecentlyUsedRecentsManager, resolveRecentlyUsedRecentFilePath } from '../integrations/recentlyUsedIntegrationRecents.js';
 
@@ -18,7 +19,7 @@ function createRecentlyUsedDefinitionSymbolsInstance() {
     let recentManager = null;
     let symbolsSearchRenderer = null;
 
-    const definition = {
+    const definition = new RecentlyUsedSectionDefinition({
         id: 'symbols',
         targetTab: 'Symbols',
         layoutType: 'grid',
@@ -35,7 +36,7 @@ function createRecentlyUsedDefinitionSymbolsInstance() {
             icon: null,
         },
         listPresentation: null,
-    };
+    });
 
     /**
      * Initializes the symbols recents manager.
diff --git a/gnome-extensions/extension/features/RecentlyUsed/registry/recentlyUsedRegistry.js b/gnome-extensions/extension/features/RecentlyUsed/registry/recentlyUsedRegistry.js
@@ -2,6 +2,7 @@ import { gettext as _ } from 'resource:///org/gnome/shell/extensions/extension.j
 
 import { Logger } from '../../../shared/utilities/utilityLogger.js';
 
+import { ensureRecentlyUsedSectionDefinition } from './recentlyUsedSectionDefinition.js';
 import { getRecentlyUsedOrder } from '../definitions/recentlyUsedOrder.js';
 
 let recentlyUsedRegistry = null;
@@ -100,11 +101,17 @@ export async function initializeRecentlyUsedRegistry() {
                     return null;
                 }
 
-                return {
-                    ...sectionDefinition,
-                    ...orderEntry,
-                    id: sectionDefinition.id,
-                };
+                const normalizedSectionDefinition = ensureRecentlyUsedSectionDefinition(sectionDefinition);
+                if (!normalizedSectionDefinition) {
+                    return null;
+                }
+
+                const sectionDefinitionId = normalizedSectionDefinition.id;
+                Object.assign(normalizedSectionDefinition, orderEntry, {
+                    id: sectionDefinitionId,
+                });
+
+                return normalizedSectionDefinition;
             }),
         );
         registerRecentlyUsedSections(sectionDefinitions.filter(Boolean));
diff --git a/gnome-extensions/extension/features/RecentlyUsed/registry/recentlyUsedRuntimeService.js b/gnome-extensions/extension/features/RecentlyUsed/registry/recentlyUsedRuntimeService.js
@@ -1,6 +1,7 @@
 import { isCallable } from '../../../shared/utilities/utilityFunction.js';
 import { Logger } from '../../../shared/utilities/utilityLogger.js';
 
+import { ensureRecentlyUsedSectionDefinition } from './recentlyUsedSectionDefinition.js';
 import { normalizeRecentlyUsedSearchQuery } from '../utilities/recentlyUsedSearch.js';
 import { RecentlyUsedDisplayMode } from '../constants/recentlyUsedPolicyConstants.js';
 import { RecentlyUsedSearchStateManager } from './recentlyUsedSearchStateManager.js';
@@ -77,10 +78,6 @@ export class RecentlyUsedRuntimeService {
     stop() {
         const sectionDefinitions = this.getOrderedSections();
         for (const section of sectionDefinitions) {
-            if (!isCallable(section.destroy)) {
-                continue;
-            }
-
             try {
                 section.destroy();
             } catch {
@@ -133,16 +130,23 @@ export class RecentlyUsedRuntimeService {
                 return sectionDefinition;
             }
 
-            const instanceId = typeof instance.id === 'string' && instance.id.length > 0 ? instance.id : sectionDefinition.id;
+            const normalizedInstance = ensureRecentlyUsedSectionDefinition(instance);
+            if (!normalizedInstance) {
+                return sectionDefinition;
+            }
+
+            const instanceId = typeof normalizedInstance.id === 'string' && normalizedInstance.id.length > 0 ? normalizedInstance.id : sectionDefinition.id;
             if (instanceId !== sectionDefinition.id) {
                 Logger.warn(`Recently Used section '${sectionDefinition.id || '<unknown>'}' createInstance() returned mismatched id '${instanceId}'. Using template id.`);
             }
 
-            return {
-                ...sectionDefinition,
-                ...instance,
+            const sectionDefinitionData = { ...sectionDefinition };
+            const instanceData = { ...normalizedInstance };
+            Object.assign(normalizedInstance, sectionDefinitionData, instanceData, {
                 id: sectionDefinition.id,
-            };
+            });
+
+            return normalizedInstance;
         } catch (e) {
             const message = e?.message ?? String(e);
             Logger.warn(`Failed to instantiate Recently Used section '${sectionDefinition.id || '<unknown>'}': ${message}`);
@@ -171,10 +175,6 @@ export class RecentlyUsedRuntimeService {
 
         await Promise.all(
             sectionDefinitions.map(async (section) => {
-                if (!isCallable(section.initialize)) {
-                    return;
-                }
-
                 try {
                     await section.initialize({
                         extensionUuid: this._extension.uuid,
@@ -256,7 +256,7 @@ export class RecentlyUsedRuntimeService {
             searchQuery,
         };
 
-        if (isCallable(sectionConfig.isEnabled) && !sectionConfig.isEnabled(runtimeContext)) {
+        if (!sectionConfig.isEnabled(runtimeContext)) {
             return invisibleModel;
         }
 
@@ -265,8 +265,7 @@ export class RecentlyUsedRuntimeService {
             return invisibleModel;
         }
 
-        const mapItem = isCallable(sectionConfig.mapItem) ? sectionConfig.mapItem : (item) => item;
-        const mappedItems = sourceItems.map((item) => mapItem(item));
+        const mappedItems = sourceItems.map((item) => sectionConfig.mapItem(item));
         const filteredItems = searchQuery.length > 0 ? mappedItems.filter((item) => this._searchStateManager.matchesSectionSearch(sectionConfig, item, searchQuery, runtimeContext)) : mappedItems;
 
         if (filteredItems.length === 0) {
@@ -291,7 +290,7 @@ export class RecentlyUsedRuntimeService {
     async handleItemClick(itemData, sectionId) {
         const sectionDefinition = this._getSectionById(sectionId);
 
-        if (!isCallable(sectionDefinition?.onClick)) {
+        if (!sectionDefinition) {
             return false;
         }
 
@@ -353,18 +352,16 @@ export class RecentlyUsedRuntimeService {
             gridLayout,
             listLayout,
             nestedLayout,
-            listContentRenderer: isCallable(sectionConfig.renderListContent) ? (args) => sectionConfig.renderListContent(args) : null,
-            gridIconResolver: isCallable(sectionConfig.resolveGridIcon) ? (iconKind) => sectionConfig.resolveGridIcon(iconKind) : null,
-            onGridItemCreated: isCallable(sectionConfig.onGridItemCreated)
-                ? ({ item, widget }) =>
-                      sectionConfig.onGridItemCreated({
-                          item,
-                          widget,
-                          renderSession: viewRuntimeContext.renderSession,
-                          currentRenderSession: viewRuntimeContext.currentRenderSession,
-                          widgetFactory: viewRuntimeContext.widgetFactory,
-                      })
-                : null,
+            listContentRenderer: (args) => sectionConfig.renderListContent(args),
+            gridIconResolver: (iconKind) => sectionConfig.resolveGridIcon(iconKind),
+            onGridItemCreated: ({ item, widget }) =>
+                sectionConfig.onGridItemCreated({
+                    item,
+                    widget,
+                    renderSession: viewRuntimeContext.renderSession,
+                    currentRenderSession: viewRuntimeContext.currentRenderSession,
+                    widgetFactory: viewRuntimeContext.widgetFactory,
+                }),
         };
     }
 
diff --git a/gnome-extensions/extension/features/RecentlyUsed/registry/recentlyUsedSearchStateManager.js b/gnome-extensions/extension/features/RecentlyUsed/registry/recentlyUsedSearchStateManager.js
@@ -41,11 +41,11 @@ export class RecentlyUsedSearchStateManager {
      * @returns {Array<object>} Source items for current render pass.
      */
     resolveSectionSourceItems(sectionConfig, runtimeContext, searchQuery) {
-        const localItemsRaw = isCallable(sectionConfig.getItems) ? sectionConfig.getItems(runtimeContext) : [];
+        const localItemsRaw = sectionConfig.getItems(runtimeContext);
         const localItems = Array.isArray(localItemsRaw) ? localItemsRaw : [];
         const localItemsSignature = this._createSectionItemsSignature(localItems);
 
-        if (!searchQuery || !isCallable(sectionConfig.searchItems) || !sectionConfig.id) {
+        if (!searchQuery || !sectionConfig.id) {
             if (sectionConfig?.id) {
                 this._sectionSearchState.delete(sectionConfig.id);
             }
@@ -118,19 +118,17 @@ export class RecentlyUsedSearchStateManager {
      * @returns {boolean} True when the item matches.
      */
     matchesSectionSearch(sectionConfig, item, query, runtimeContext) {
-        if (isCallable(sectionConfig?.matchesSearch)) {
-            try {
-                return Boolean(
-                    sectionConfig.matchesSearch({
-                        item,
-                        query,
-                        runtimeContext,
-                        fallbackMatch: (candidate) => matchesRecentlyUsedSearch({ item: candidate, query }),
-                    }),
-                );
-            } catch {
-                // Fall back to generic matching when a custom matcher fails.
-            }
+        try {
+            return Boolean(
+                sectionConfig.matchesSearch({
+                    item,
+                    query,
+                    runtimeContext,
+                    fallbackMatch: (candidate) => matchesRecentlyUsedSearch({ item: candidate, query }),
+                }),
+            );
+        } catch {
+            // Fall back to generic matching when a custom matcher fails.
         }
 
         return matchesRecentlyUsedSearch({ item, query });
diff --git a/gnome-extensions/extension/features/RecentlyUsed/registry/recentlyUsedSectionDefinition.js b/gnome-extensions/extension/features/RecentlyUsed/registry/recentlyUsedSectionDefinition.js
diff --git a/gnome-extensions/extension/features/RecentlyUsed/registry/recentlyUsedSignalManager.js b/gnome-extensions/extension/features/RecentlyUsed/registry/recentlyUsedSignalManager.js
