Merge branch 'dev' of https://github.com/Tormak9970/TabMaster into dev

Tormak9970 · Jul 4, 2024 · 102e590 · 102e590
2 parents 403e925 + 555357e
commit 102e590
Show file tree

Hide file tree

Showing 10 changed files with 192 additions and 80 deletions.
diff --git a/src/components/CustomTabContainer.tsx b/src/components/CustomTabContainer.tsx
@@ -1,7 +1,8 @@
 import { EditableTabSettings } from "./modals/EditTabModal";
 import { TabFilterSettings, FilterType, Filter } from "./filters/Filters";
 import { filtersHaveType, getIncludedCategoriesFromBitField } from "../lib/Utils";
-import { gamepadTabbedPageClasses } from "decky-frontend-lib";
+import { gamepadTabbedPageClasses, showModal } from "decky-frontend-lib";
+import { SortOverrideMessage } from './modals/SortOverrideMessage';
 
 /**
  * Wrapper for injecting custom tabs.
@@ -16,6 +17,7 @@ export class CustomTabContainer implements TabContainer {
   categoriesToInclude: number;
   autoHide: boolean;
   dependsOnMicroSDeck: boolean;
+  sortByOverride: number;
 
   /**
    * Creates a new CustomTabContainer.
@@ -26,8 +28,9 @@ export class CustomTabContainer implements TabContainer {
    * @param filtersMode boolean operator for top level filters
    * @param categoriesToInclude A bit field of which categories should be included in the tab.
    * @param autoHide Whether or not the tab should automatically be hidden if it's collection is empty.
+   * @param sortByOverride The eSortBy number to force use for sorting. -1 ignores override.
    */
-  constructor(id: string, title: string, position: number, filterSettingsList: TabFilterSettings<FilterType>[], filtersMode: LogicalMode, categoriesToInclude: number, autoHide: boolean) {
+  constructor(id: string, title: string, position: number, filterSettingsList: TabFilterSettings<FilterType>[], filtersMode: LogicalMode, categoriesToInclude: number, autoHide: boolean, sortByOverride: number) {
     this.id = id;
     this.title = title;
     this.position = position;
@@ -36,6 +39,7 @@ export class CustomTabContainer implements TabContainer {
     this.categoriesToInclude = categoriesToInclude;
     this.autoHide = autoHide;
     this.dependsOnMicroSDeck = false;
+    this.sortByOverride = sortByOverride;
 
     //@ts-ignore
     this.collection = {
@@ -57,17 +61,21 @@ export class CustomTabContainer implements TabContainer {
     this.checkMicroSDeckDependency();
   }
 
-  getActualTab(TabContentComponent: TabContentComponent, sortingProps: Omit<TabContentProps, 'collection'>, footer: SteamTab['footer'], collectionAppFilter: any, isMicroSDeckInstalled: boolean): SteamTab | null {
+  getActualTab(TabContentComponent: TabContentComponent, sortingProps: Omit<TabContentProps, 'collection'>, footer: SteamTab['footer'] = {}, collectionAppFilter: any, isMicroSDeckInstalled: boolean): SteamTab | null {
     if (!isMicroSDeckInstalled && this.dependsOnMicroSDeck) return null;
     if (this.autoHide && this.collection.visibleApps.length === 0) return null;
-
+    const showSortOverride = () => showModal(<SortOverrideMessage eSortBy={this.sortByOverride} />);
+    if (this.sortByOverride !== -1) footer.onOptionsButton = showSortOverride;
+
     return {
       title: this.title,
       id: this.id,
       footer: footer,
       content: <TabContentComponent
         collection={this.collection}
-        {...sortingProps}
+        setSortBy={sortingProps.setSortBy}
+        eSortBy={this.sortByOverride === -1 ? sortingProps.eSortBy : this.sortByOverride}
+        showSortingContextMenu={this.sortByOverride === -1 ? sortingProps.showSortingContextMenu : showSortOverride}
       />,
       renderTabAddon: () => {
         return <span className={gamepadTabbedPageClasses.TabCount}>
@@ -117,6 +125,7 @@ export class CustomTabContainer implements TabContainer {
     this.categoriesToInclude = updatedTabInfo.categoriesToInclude;
     this.filters = updatedTabInfo.filters;
     this.autoHide = updatedTabInfo.autoHide;
+    this.sortByOverride = updatedTabInfo.sortByOverride;
     this.buildCollection();
     this.checkMicroSDeckDependency();
   }

diff --git a/src/components/modals/EditTabModal.tsx b/src/components/modals/EditTabModal.tsx
@@ -1,8 +1,10 @@
 import {
   ConfirmModal,
   DialogCheckbox,
+  DropdownItem,
   Field,
   Focusable,
+  SingleDropdownOption,
   TextField,
   ToggleField,
   afterPatch,
@@ -19,6 +21,7 @@ import { FiltersPanel } from "../filters/FiltersPanel";
 import { IncludeCategories, capitalizeFirstLetter, getIncludedCategoriesFromBitField, playUISound, updateCategoriesToIncludeBitField } from "../../lib/Utils";
 import { BiSolidDownArrow } from "react-icons/bi";
 import { CustomTabContainer } from '../CustomTabContainer';
+import { useSortingMenuItems } from '../../hooks/useSortingMenuItems';
 
 export type EditableTabSettings = Omit<Required<TabSettings>, 'position' | 'id'>;
 
@@ -31,13 +34,15 @@ type EditTabModalProps = {
   tabMasterManager: TabMasterManager,
   filtersMode: LogicalMode,
   categoriesToInclude: number, //bit field
-  autoHide: boolean
+  autoHide: boolean;
+  sortBy: number;
 };
 
+
 /**
  * The modal for editing and creating custom tabs.
  */
-export const EditTabModal: VFC<EditTabModalProps> = ({ closeModal, onConfirm, tabId, tabTitle, tabFilters, tabMasterManager, filtersMode, categoriesToInclude, autoHide: _autoHide }) => {
+export const EditTabModal: VFC<EditTabModalProps> = ({ closeModal, onConfirm, tabId, tabTitle, tabFilters, tabMasterManager, filtersMode, categoriesToInclude, autoHide: _autoHide, sortBy }) => {
   const [name, setName] = useState<string>(tabTitle ?? '');
   const [topLevelFilters, setTopLevelFilters] = useState<TabFilterSettings<FilterType>[]>(tabFilters);
   const [topLevelLogicMode, setTopLevelLogicMode] = useState<LogicalMode>(filtersMode);
@@ -46,6 +51,8 @@ export const EditTabModal: VFC<EditTabModalProps> = ({ closeModal, onConfirm, ta
   const [canAddFilter, setCanAddFilter] = useState<boolean>(true);
   const [patchInput, setPatchInput] = useState<boolean>(true);
   const [autoHide, setAutoHide] = useState<boolean>(_autoHide);
+  const [sortByOverride, setSortByOverride] = useState(sortBy);
+  const sortOptions: SingleDropdownOption[] = useSortingMenuItems([]);
 
   const nameInputElement = <TextField value={name} placeholder="The title for this tab" onChange={onNameChange} />;
 
@@ -84,12 +91,13 @@ export const EditTabModal: VFC<EditTabModalProps> = ({ closeModal, onConfirm, ta
         filters: topLevelFilters,
         filtersMode: topLevelLogicMode,
         categoriesToInclude: catsToInclude,
-        autoHide: autoHide
+        autoHide: autoHide,
+        sortByOverride: sortByOverride
       };
       onConfirm(tabId, updated);
       closeModal!();
     } else {
-      if(!canAddFilter) PythonInterop.toast("Cannot Save Tab", "Some filters are incomplete");
+      if (!canAddFilter) PythonInterop.toast("Cannot Save Tab", "Some filters are incomplete");
       else PythonInterop.toast("Cannot Save Tab", "Please add a name and at least 1 filter");
     }
   }
@@ -116,29 +124,38 @@ export const EditTabModal: VFC<EditTabModalProps> = ({ closeModal, onConfirm, ta
           onOK={onSave}
           strOKButtonText="Save"
         >
-          <div style={{ padding: "4px 16px 1px" }} className="name-field">
-            <Field description={
-            <>
-              <div style={{ paddingBottom: "6px" }} className={quickAccessControlsClasses.PanelSectionTitle}>
-                Name
-              </div>
-              {nameInputElement}
-            </>
-            } />
-          </div>
-          <IncludeCategoriesPanel categoriesToInclude={catsToInclude} setCategoriesToInclude={setCatsToInclude} />
-          <div className='autohide-toggle-container'>
-            <ToggleField label='Automatically hide tab if empty' checked={autoHide} onChange={checked => setAutoHide(checked)} bottomSeparator='thick'/>
-          </div>
-          <FiltersPanel
-            groupFilters={topLevelFilters}
-            setGroupFilters={setTopLevelFilters}
-            addFilter={addFilter}
-            groupLogicMode={topLevelLogicMode}
-            setGroupLogicMode={setTopLevelLogicMode}
-            canAddFilter={canAddFilter}
-            collapseFilters={!!tabTitle}
-          />
+          <Focusable onMenuButton={onSave} onMenuActionDescription='Save'>
+            <div style={{ padding: "4px 16px 1px" }} className="name-field">
+              <Field description={
+                <>
+                  <div style={{ paddingBottom: "6px" }} className={quickAccessControlsClasses.PanelSectionTitle}>
+                    Name
+                  </div>
+                  {nameInputElement}
+                </>
+              } />
+            </div>
+            <IncludeCategoriesPanel categoriesToInclude={catsToInclude} setCategoriesToInclude={setCatsToInclude} />
+            <div className='field-item-container'>
+              <ToggleField label='Automatically hide tab if empty' checked={autoHide} onChange={checked => setAutoHide(checked)} bottomSeparator='thick' />
+              <DropdownItem
+                label='Sort apps by'
+                rgOptions={sortOptions}
+                selectedOption={sortByOverride}
+                onChange={option => setSortByOverride(option.data)}
+                bottomSeparator='thick'
+              />
+            </div>
+            <FiltersPanel
+              groupFilters={topLevelFilters}
+              setGroupFilters={setTopLevelFilters}
+              addFilter={addFilter}
+              groupLogicMode={topLevelLogicMode}
+              setGroupLogicMode={setTopLevelLogicMode}
+              canAddFilter={canAddFilter}
+              collapseFilters={!!tabTitle}
+            />
+          </Focusable>
         </ConfirmModal>
       </div>
     </TabMasterContextProvider>
@@ -159,9 +176,9 @@ const IncludeCategoriesPanel: VFC<IncludeCategoriesPanelProps> = ({ categoriesTo
 
   const showHiddenCat = Object.entries(catsToIncludeObj).filter(([cat]) => cat !== 'hidden').some(([_cat, checked]) => checked);
 
-  const getCatLabel = (category: string) => category === 'music' ? 'Soundtracks' : capitalizeFirstLetter(category)
+  const getCatLabel = (category: string) => category === 'music' ? 'Soundtracks' : capitalizeFirstLetter(category);
 
-  let catStrings = []
+  let catStrings = [];
   for (const cat in catsToIncludeObj) {
     const include = catsToIncludeObj[cat as keyof typeof catsToIncludeObj];
 
@@ -186,8 +203,8 @@ const IncludeCategoriesPanel: VFC<IncludeCategoriesPanelProps> = ({ categoriesTo
               <div style={{ padding: "12px 0", float: "left" }} className={quickAccessControlsClasses.PanelSectionTitle}>
                 Include in tab
               </div>
-              <div style={{padding: "12px 40px", flex: "1"}}>
-                {!isOpen && <span style={{ fontSize: "12px", lineHeight: "12px", color: "#8b929a"}}> 
+              <div style={{ padding: "12px 40px", flex: "1" }}>
+                {!isOpen && <span style={{ fontSize: "12px", lineHeight: "12px", color: "#8b929a" }}>
                   {catStrings.join(', ')}
                 </span>}
               </div>
@@ -205,12 +222,12 @@ const IncludeCategoriesPanel: VFC<IncludeCategoriesPanelProps> = ({ categoriesTo
         {isOpen && (
           <div style={{ padding: "10px 18px" }}>
             {Object.entries(catsToIncludeObj).map(([category, shouldInclude]) => {
-              const label = getCatLabel(category)
+              const label = getCatLabel(category);
 
               const onChange = (checked: boolean) => {
                 playUISound(checked ? '/sounds/deck_ui_switch_toggle_on.wav' : '/sounds/deck_ui_switch_toggle_off.wav');
                 setCategoriesToInclude(currentCatsBitField => updateCategoriesToIncludeBitField(currentCatsBitField, { [category]: checked }));
-              }; 
+              };
               return category === 'hidden' && !showHiddenCat ? null : <DialogCheckbox checked={shouldInclude} onChange={onChange} label={label} />;
             })}
           </div>)}
@@ -220,7 +237,8 @@ const IncludeCategoriesPanel: VFC<IncludeCategoriesPanelProps> = ({ categoriesTo
         left: "calc(16px - 1.8vw)",
         right: "calc(16px - 1.8vw)",
         height: "1px",
-        background: "#ffffff1a" }}
+        background: "#ffffff1a"
+      }}
       />
     </>
   );
@@ -231,18 +249,27 @@ const IncludeCategoriesPanel: VFC<IncludeCategoriesPanelProps> = ({ categoriesTo
  * @param tabMasterManager TabMasterManager instance.
  */
 export function showModalNewTab(tabMasterManager: TabMasterManager) {
-    showModal(
-      <EditTabModal
-        onConfirm={(_: any, tabSettings: EditableTabSettings) => {
-          tabMasterManager.createCustomTab(tabSettings.title, tabMasterManager.getTabs().visibleTabsList.length, tabSettings.filters, tabSettings.filtersMode, tabSettings.categoriesToInclude, tabSettings.autoHide);
-        }}
-        tabFilters={[]}
-        tabMasterManager={tabMasterManager}
-        filtersMode="and"
-        categoriesToInclude={IncludeCategories.games}
-        autoHide={false}
-      />
-    );
+  showModal(
+    <EditTabModal
+      onConfirm={(_: any, tabSettings: EditableTabSettings) => {
+        tabMasterManager.createCustomTab(
+          tabSettings.title,
+          tabMasterManager.getTabs().visibleTabsList.length,
+          tabSettings.filters,
+          tabSettings.filtersMode,
+          tabSettings.categoriesToInclude,
+          tabSettings.autoHide,
+          tabSettings.sortByOverride
+        );
+      }}
+      tabFilters={[]}
+      tabMasterManager={tabMasterManager}
+      filtersMode="and"
+      categoriesToInclude={IncludeCategories.games}
+      autoHide={false}
+      sortBy={-1}
+    />
+  );
 }
 
 /**
@@ -251,18 +278,19 @@ export function showModalNewTab(tabMasterManager: TabMasterManager) {
  * @param tabMasterManager TabMasterManager instance.
  */
 export function showModalEditTab(tabContainer: CustomTabContainer, tabMasterManager: TabMasterManager) {
-    showModal(
-      <EditTabModal
-        onConfirm={(tabId: string | undefined, updatedTabSettings: EditableTabSettings) => {
-          tabMasterManager.updateCustomTab(tabId!, updatedTabSettings);
-        }}
-        tabId={tabContainer.id}
-        tabTitle={tabContainer.title}
-        tabFilters={tabContainer.filters}
-        tabMasterManager={tabMasterManager}
-        filtersMode={tabContainer.filtersMode}
-        categoriesToInclude={tabContainer.categoriesToInclude}
-        autoHide={tabContainer.autoHide}
-      />
-    );
+  showModal(
+    <EditTabModal
+      onConfirm={(tabId: string | undefined, updatedTabSettings: EditableTabSettings) => {
+        tabMasterManager.updateCustomTab(tabId!, updatedTabSettings);
+      }}
+      tabId={tabContainer.id}
+      tabTitle={tabContainer.title}
+      tabFilters={tabContainer.filters}
+      tabMasterManager={tabMasterManager}
+      filtersMode={tabContainer.filtersMode}
+      categoriesToInclude={tabContainer.categoriesToInclude}
+      autoHide={tabContainer.autoHide}
+      sortBy={tabContainer.sortByOverride}
+    />
+  );
 }
diff --git a/src/components/modals/SortOverrideMessage.tsx b/src/components/modals/SortOverrideMessage.tsx
@@ -0,0 +1,19 @@
+import { ConfirmModal } from 'decky-frontend-lib';
+import { VFC } from 'react';
+import { getESortByLabel } from '../../hooks/useSortingMenuItems';
+
+interface SortOverrideMessageProps { 
+  eSortBy: number;
+  closeModal?: () => void; 
+}
+
+/**
+ * The message modal to display when sort method is being overriden
+ */
+export const SortOverrideMessage: VFC<SortOverrideMessageProps> = ({ eSortBy, closeModal }) => {
+  return (
+    <ConfirmModal strTitle={`Sort By: ${getESortByLabel(eSortBy)}`} bAlertDialog={true} closeModal={closeModal}>
+      The sorting method is overridden by TabMaster for this tab. Set 'Sort apps by' to 'default' in this tabs settings if you would like it to use library sorting.
+    </ConfirmModal>
+  );
+};
diff --git a/src/components/styles/ModalStyles.tsx b/src/components/styles/ModalStyles.tsx
@@ -103,11 +103,11 @@ export const ModalStyles: VFC<{}> = ({}) => {
         flex-grow: 1;
       }
 
-      .autohide-toggle-container .${gamepadDialogClasses.Field} {
+      .field-item-container .${gamepadDialogClasses.Field} {
         padding: 10px calc(28px + 1.4vw);
       }
 
-      .autohide-toggle-container .${gamepadDialogClasses.FieldLabel} {
+      .field-item-container .${gamepadDialogClasses.FieldLabel} {
         color: #8b929a;
         font-size: 12px;
       }

diff --git a/src/hooks/useSortingMenuItems.tsx b/src/hooks/useSortingMenuItems.tsx
@@ -0,0 +1,37 @@
+import { useMemo } from 'react';
+
+/**
+ * Gets the localized version of a sorting method
+ */
+export function getESortByLabel(eSortBy: number) {
+  const map: { [eSortBy: number]: string; } = {
+    1: "#Library_SortByAlphabetical",
+    10: "#Library_SortByFriendsPlaying",
+    2: "#Library_SortByPctAchievementsComplete",
+    3: "#Library_SortByLastUpdated",
+    4: "#Library_SortByHoursPlayed",
+    5: "#Library_SortByLastPlayed",
+    6: "#Library_SortByReleaseDate",
+    7: "#Library_SortByAddedToLibrary",
+    8: "#Library_SortBySizeOnDisk",
+    9: "#Library_SortByMetacriticScore",
+    11: "#Library_SortBySteamReview",
+  };
+  return LocalizationManager.LocalizeString(map[eSortBy]);
+}
+
+/**
+ * Creates the array of sorting SingleDropdownOptions
+ */
+function getSortingMenuItems() {
+  return [1, 10, 2, 4, 5, 6, 7, 8, 9, 11].map((e => ({
+    data: e,
+    label: getESortByLabel(e)!
+  })));
+}
+
+/**
+ * Hook to use memoized sort options
+ * @param deps Dependency array to determine when to recalculate
+ */
+export const useSortingMenuItems = (deps: any[]) => useMemo(() => [{ label: 'Default', data: -1 }].concat(getSortingMenuItems()), deps);
diff --git a/src/index.tsx b/src/index.tsx
@@ -33,6 +33,7 @@ declare global {
   let securitystore: SecurityStore;
   let settingsStore: SettingsStore;
   let appAchievementProgressCache: AppAchievementProgressCache;
+  let LocalizationManager: LocalizationManager;
 }