commit e14517863f8c1573219a1c5843325bb0ffaccaec · notnite.com/moonlight

+146 -16

packages/core-extensions/src/moonbase/ui/filterBar.tsx

···

       6
       6
        
         ChevronSmallUpIconSVG

     

       7
       7
        
       } from "../types";

     

       8
       8
        
       

     

       9
       9
       +
       export const defaultFilter = {

     

       10
       10
       +
         core: true,

     

       11
       11
       +
         normal: true,

     

       12
       12
       +
         developer: true,

     

       13
       13
       +
         enabled: true,

     

       14
       14
       +
         disabled: true,

     

       15
       15
       +
         installed: true,

     

       16
       16
       +
         repository: true

     

       17
       17
       +
       };

     

       18
       18
       +
       export type Filter = typeof defaultFilter;

     

       19
       19
       +
       

     

       9
       20
        
       export default async (require: WebpackRequireType) => {

     

       10
       21
        
         const spacepack = require("spacepack_spacepack").spacepack;

     

       11
       22
        
         const React = require("common_react");

     
···

       30
       41
        
         await require.el(moduleId);

     

       31
       42
        
       

     

       32
       43
        
         const Margins = spacepack.findByCode("marginCenterHorz:")[0].exports;

     

       44
       44
       +
         const SortMenuClasses = spacepack.findByCode("container:", "clearText:")[0]

     

       45
       45
       +
           .exports;

     

       33
       46
        
         const FilterDialogClasses = spacepack.findByCode(

     

       34
       47
        
           "countContainer:",

     

       35
       48
        
           "tagContainer:"

     
···

       58
       71
        
           setSelectedTags(newState);

     

       59
       72
        
         }

     

       60
       73
        
       

     

       74
       74
       +
         function FilterButtonPopout({

     

       75
       75
       +
           filter,

     

       76
       76
       +
           setFilter,

     

       77
       77
       +
           closePopout

     

       78
       78
       +
         }: {

     

       79
       79
       +
           filter: Filter;

     

       80
       80
       +
           setFilter: (filter: Filter) => void;

     

       81
       81
       +
           closePopout: () => void;

     

       82
       82
       +
         }) {

     

       83
       83
       +
           const {

     

       84
       84
       +
             Menu,

     

       85
       85
       +
             MenuItem,

     

       86
       86
       +
             MenuGroup,

     

       87
       87
       +
             MenuCheckboxItem

     

       88
       88
       +
           } = require("common_components");

     

       89
       89
       +
       

     

       90
       90
       +
           return (

     

       91
       91
       +
             <div className={SortMenuClasses.container}>

     

       92
       92
       +
               <Menu navId="sort-filter" hideScrollbar={true} onClose={closePopout}>

     

       93
       93
       +
                 <MenuGroup label="Type">

     

       94
       94
       +
                   <MenuCheckboxItem

     

       95
       95
       +
                     id="t-core"

     

       96
       96
       +
                     label="Core"

     

       97
       97
       +
                     checked={filter.core}

     

       98
       98
       +
                     action={() => setFilter({ ...filter, core: !filter.core })}

     

       99
       99
       +
                   />

     

       100
       100
       +
                   <MenuCheckboxItem

     

       101
       101
       +
                     id="t-normal"

     

       102
       102
       +
                     label="Normal"

     

       103
       103
       +
                     checked={filter.normal}

     

       104
       104
       +
                     action={() => setFilter({ ...filter, normal: !filter.normal })}

     

       105
       105
       +
                   />

     

       106
       106
       +
                   <MenuCheckboxItem

     

       107
       107
       +
                     id="t-developer"

     

       108
       108
       +
                     label="Developer"

     

       109
       109
       +
                     checked={filter.developer}

     

       110
       110
       +
                     action={() =>

     

       111
       111
       +
                       setFilter({ ...filter, developer: !filter.developer })

     

       112
       112
       +
                     }

     

       113
       113
       +
                   />

     

       114
       114
       +
                 </MenuGroup>

     

       115
       115
       +
                 <MenuGroup label="State">

     

       116
       116
       +
                   <MenuCheckboxItem

     

       117
       117
       +
                     id="s-enabled"

     

       118
       118
       +
                     label="Enabled"

     

       119
       119
       +
                     checked={filter.enabled}

     

       120
       120
       +
                     action={() => setFilter({ ...filter, enabled: !filter.enabled })}

     

       121
       121
       +
                   />

     

       122
       122
       +
                   <MenuCheckboxItem

     

       123
       123
       +
                     id="s-disabled"

     

       124
       124
       +
                     label="Disabled"

     

       125
       125
       +
                     checked={filter.disabled}

     

       126
       126
       +
                     action={() =>

     

       127
       127
       +
                       setFilter({ ...filter, disabled: !filter.disabled })

     

       128
       128
       +
                     }

     

       129
       129
       +
                   />

     

       130
       130
       +
                 </MenuGroup>

     

       131
       131
       +
                 <MenuGroup label="Location">

     

       132
       132
       +
                   <MenuCheckboxItem

     

       133
       133
       +
                     id="l-installed"

     

       134
       134
       +
                     label="Installed"

     

       135
       135
       +
                     checked={filter.installed}

     

       136
       136
       +
                     action={() =>

     

       137
       137
       +
                       setFilter({ ...filter, installed: !filter.installed })

     

       138
       138
       +
                     }

     

       139
       139
       +
                   />

     

       140
       140
       +
                   <MenuCheckboxItem

     

       141
       141
       +
                     id="l-repository"

     

       142
       142
       +
                     label="Repository"

     

       143
       143
       +
                     checked={filter.repository}

     

       144
       144
       +
                     action={() =>

     

       145
       145
       +
                       setFilter({ ...filter, repository: !filter.repository })

     

       146
       146
       +
                     }

     

       147
       147
       +
                   />

     

       148
       148
       +
                 </MenuGroup>

     

       149
       149
       +
                 <MenuGroup>

     

       150
       150
       +
                   <MenuItem

     

       151
       151
       +
                     id="reset-all"

     

       152
       152
       +
                     className={SortMenuClasses.clearText}

     

       153
       153
       +
                     label={

     

       154
       154
       +
                       <Text variant="text-sm/medium" color="none">

     

       155
       155
       +
                         Reset to default

     

       156
       156
       +
                       </Text>

     

       157
       157
       +
                     }

     

       158
       158
       +
                     action={() => {

     

       159
       159
       +
                       setFilter({ ...defaultFilter });

     

       160
       160
       +
                       closePopout();

     

       161
       161
       +
                     }}

     

       162
       162
       +
                   />

     

       163
       163
       +
                 </MenuGroup>

     

       164
       164
       +
               </Menu>

     

       165
       165
       +
             </div>

     

       166
       166
       +
           );

     

       167
       167
       +
         }

     

       168
       168
       +
       

     

       61
       169
        
         function TagButtonPopout({

     

       62
       170
        
           selectedTags,

     

       63
       171
        
           setSelectedTags,

     
···

       117
       225
        
         }

     

       118
       226
        
       

     

       119
       227
        
         return function FilterBar({

     

       228
       228
       +
           filter,

     

       229
       229
       +
           setFilter,

     

       120
       230
        
           selectedTags,

     

       121
       231
        
           setSelectedTags

     

       122
       232
        
         }: {

     

       233
       233
       +
           filter: Filter;

     

       234
       234
       +
           setFilter: (filter: Filter) => void;

     

       123
       235
        
           selectedTags: Set<string>;

     

       124
       236
        
           setSelectedTags: (tags: Set<string>) => void;

     

       125
       237
        
         }) {

     
···

       159
       271
        
               }}

     

       160
       272
        
               className={`${FilterBarClasses.tagsContainer} ${Margins.marginBottom8}`}

     

       161
       273
        
             >

     

       162
       162
       -
               <Button

     

       163
       163
       -
                 size={Button.Sizes.MIN}

     

       164
       164
       -
                 color={Button.Colors.CUSTOM}

     

       165
       165
       -
                 className={FilterBarClasses.sortDropdown}

     

       166
       166
       -
                 innerClassName={FilterBarClasses.sortDropdownInner}

     

       274
       274
       +
               <Popout

     

       275
       275
       +
                 renderPopout={({ closePopout }: any) => (

     

       276
       276
       +
                   <FilterButtonPopout

     

       277
       277
       +
                     filter={filter}

     

       278
       278
       +
                     setFilter={setFilter}

     

       279
       279
       +
                     closePopout={closePopout}

     

       280
       280
       +
                   />

     

       281
       281
       +
                 )}

     

       282
       282
       +
                 position="bottom"

     

       283
       283
       +
                 align="left"

     

       167
       284
        
               >

     

       168
       168
       -
                 <ArrowsUpDownIcon />

     

       169
       169
       -
                 <Text

     

       170
       170
       -
                   className={FilterBarClasses.sortDropdownText}

     

       171
       171
       -
                   variant="text-sm/medium"

     

       172
       172
       -
                   color="interactive-normal"

     

       173
       173
       -
                 >

     

       174
       174
       -
                   Sort & filter

     

       175
       175
       -
                 </Text>

     

       176
       176
       -
                 <ChevronSmallDownIcon size={20} />

     

       177
       177
       -
               </Button>

     

       285
       285
       +
                 {(props: any, { isShown }: { isShown: boolean }) => (

     

       286
       286
       +
                   <Button

     

       287
       287
       +
                     {...props}

     

       288
       288
       +
                     size={Button.Sizes.MIN}

     

       289
       289
       +
                     color={Button.Colors.CUSTOM}

     

       290
       290
       +
                     className={FilterBarClasses.sortDropdown}

     

       291
       291
       +
                     innerClassName={FilterBarClasses.sortDropdownInner}

     

       292
       292
       +
                   >

     

       293
       293
       +
                     <ArrowsUpDownIcon />

     

       294
       294
       +
                     <Text

     

       295
       295
       +
                       className={FilterBarClasses.sortDropdownText}

     

       296
       296
       +
                       variant="text-sm/medium"

     

       297
       297
       +
                       color="interactive-normal"

     

       298
       298
       +
                     >

     

       299
       299
       +
                       Sort & filter

     

       300
       300
       +
                     </Text>

     

       301
       301
       +
                     {isShown ? (

     

       302
       302
       +
                       <ChevronSmallUpIcon size={20} />

     

       303
       303
       +
                     ) : (

     

       304
       304
       +
                       <ChevronSmallDownIcon size={20} />

     

       305
       305
       +
                     )}

     

       306
       306
       +
                   </Button>

     

       307
       307
       +
                 )}

     

       308
       308
       +
               </Popout>

     

       178
       309
        
               <div className={FilterBarClasses.divider} />

     

       179
       179
       -
               {/* TODO: make this scrollable with a ListNavigator */}

     

       180
       310
        
               <div className={FilterBarClasses.tagList}>

     

       181
       311
        
                 <div ref={tagListInner} className={FilterBarClasses.tagListInner}>

     

       182
       312
        
                   {Object.keys(tagNames).map((tag) => (

+23 -2

packages/core-extensions/src/moonbase/ui/index.tsx

···

       1
       1
       -
       import { ExtensionTag, WebpackRequireType } from "@moonlight-mod/types";

     

       1
       1
       +
       import {

     

       2
       2
       +
         ExtensionLoadSource,

     

       3
       3
       +
         ExtensionTag,

     

       4
       4
       +
         WebpackRequireType

     

       5
       5
       +
       } from "@moonlight-mod/types";

     

       2
       6
        
       import card from "./card";

     

       3
       3
       -
       import filterBar from "./filterBar";

     

       7
       7
       +
       import filterBar, { defaultFilter } from "./filterBar";

     

       8
       8
       +
       import { ExtensionState } from "../types";

     

       4
       9
        
       

     

       5
       10
        
       export enum ExtensionPage {

     

       6
       11
        
         Info,

     
···

       36
       41
        
           );

     

       37
       42
        
       

     

       38
       43
        
           const [query, setQuery] = React.useState("");

     

       44
       44
       +
           const [filter, setFilter] = React.useState({ ...defaultFilter });

     

       39
       45
        
           const [selectedTags, setSelectedTags] = React.useState(new Set<string>());

     

       40
       46
        
       

     

       41
       47
        
           const sorted = Object.values(extensions).sort((a, b) => {

     
···

       51
       57
        
                 ext.manifest.meta?.description?.toLowerCase().includes(query)) &&

     

       52
       58
        
               [...selectedTags.values()].every(

     

       53
       59
        
                 (tag) => ext.manifest.meta?.tags?.includes(tag as ExtensionTag)

     

       60
       60
       +
               ) &&

     

       61
       61
       +
               // This seems very bad, sorry

     

       62
       62
       +
               !(

     

       63
       63
       +
                 (!filter.core && ext.source.type === ExtensionLoadSource.Core) ||

     

       64
       64
       +
                 (!filter.normal && ext.source.type === ExtensionLoadSource.Normal) ||

     

       65
       65
       +
                 (!filter.developer &&

     

       66
       66
       +
                   ext.source.type === ExtensionLoadSource.Developer) ||

     

       67
       67
       +
                 (!filter.enabled &&

     

       68
       68
       +
                   MoonbaseSettingsStore.getExtensionEnabled(ext.id)) ||

     

       69
       69
       +
                 (!filter.disabled &&

     

       70
       70
       +
                   !MoonbaseSettingsStore.getExtensionEnabled(ext.id)) ||

     

       71
       71
       +
                 (!filter.installed && ext.state !== ExtensionState.NotDownloaded) ||

     

       72
       72
       +
                 (!filter.repository && ext.state === ExtensionState.NotDownloaded)

     

       54
       73
        
               )

     

       55
       74
        
           );

     

       56
       75
        
       

     
···

       77
       96
        
                 }}

     

       78
       97
        
               />

     

       79
       98
        
               <FilterBar

     

       99
       99
       +
                 filter={filter}

     

       100
       100
       +
                 setFilter={setFilter}

     

       80
       101
        
                 selectedTags={selectedTags}

     

       81
       102
        
                 setSelectedTags={setSelectedTags}

     

       82
       103
        
               />

packages/types/src/coreExtensions/components.ts

···

       304
       304
        
         Card: ComponentClass<PropsWithChildren<any>>;

     

       305
       305
        
         Popout: ComponentClass<PropsWithChildren<any>>;

     

       306
       306
        
         Dialog: ComponentClass<PropsWithChildren<any>>;

     

       307
       307
       +
         Menu: ComponentClass<PropsWithChildren<any>>;

     

       308
       308
       +
         MenuItem: ComponentClass<PropsWithChildren<any>>;

     

       309
       309
       +
         MenuGroup: ComponentClass<PropsWithChildren<any>>;

     

       310
       310
       +
         MenuCheckboxItem: ComponentClass<PropsWithChildren<any>>;

     

       307
       311
        
         CardClasses: {

     

       308
       312
        
           card: string;

     

       309
       313
        
           cardHeader: string;