commit e93cb3b52162a80e41877299962c58b0d13e0401 · notnite.com/moonlight

+7 -2

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

···

       3
       3
        
         ExtensionSettingsManifest,

     

       4
       4
        
         MultiSelectSettingType,

     

       5
       5
        
         NumberSettingType,

     

       6
       6
       +
         SelectOption,

     

       6
       7
        
         SelectSettingType

     

       7
       8
        
       } from "@moonlight-mod/types/config";

     

       8
       9
        
       import WebpackRequire from "@moonlight-mod/types/discord/require";

     
···

       134
       135
        
                 autofocus={false}

     

       135
       136
        
                 clearable={false}

     

       136
       137
        
                 value={value ?? ""}

     

       137
       137
       -
                 options={options.map((o) => ({ value: o, label: o }))}

     

       138
       138
       +
                 options={options.map((o: SelectOption) =>

     

       139
       139
       +
                   typeof o === "string" ? { value: o, label: o } : o

     

       140
       140
       +
                 )}

     

       138
       141
        
                 onChange={(value: string) => {

     

       139
       142
        
                   MoonbaseSettingsStore.setExtensionConfig(ext.id, name, value);

     

       140
       143
        
                 }}

     
···

       162
       165
        
                 autofocus={false}

     

       163
       166
        
                 clearable={false}

     

       164
       167
        
                 closeOnSelect={false}

     

       165
       165
       -
                 options={options.map((o) => ({ value: o, label: o }))}

     

       168
       168
       +
                 options={options.map((o: SelectOption) =>

     

       169
       169
       +
                   typeof o === "string" ? { value: o, label: o } : o

     

       170
       170
       +
                 )}

     

       166
       171
        
                 {...useVariableSelect({

     

       167
       172
        
                   onSelectInteraction: multiSelect,

     

       168
       173
        
                   value: new Set(Array.isArray(value) ? value : [value]),

+8 -1

packages/types/src/config.ts

···

       26
       26
        
         Custom = "custom"

     

       27
       27
        
       }

     

       28
       28
        
       

     

       29
       29
       +
       export type SelectOption =

     

       30
       30
       +
         | string

     

       31
       31
       +
         | {

     

       32
       32
       +
             value: string;

     

       33
       33
       +
             label: string;

     

       34
       34
       +
           };

     

       35
       35
       +
       

     

       29
       36
        
       export type BooleanSettingType = {

     

       30
       37
        
         type: ExtensionSettingType.Boolean;

     

       31
       38
        
         default?: boolean;

     
···

       45
       52
        
       

     

       46
       53
        
       export type SelectSettingType = {

     

       47
       54
        
         type: ExtensionSettingType.Select;

     

       48
       48
       -
         options: string[];

     

       55
       55
       +
         options: SelectOption[];

     

       49
       56
        
         default?: string;

     

       50
       57
        
       };

     

       51
       58