commit 0fe2201252479a29fcc6f712b5de9611227cb79f · notnite.com/moonlight

+3

packages/core-extensions/src/common/index.ts

···

       6
       6
        
         },

     

       7
       7
        
         ErrorBoundary: {

     

       8
       8
        
           dependencies: [{ id: "react" }]

     

       9
       9
       +
         },

     

       10
       10
       +
         icons: {

     

       11
       11
       +
           dependencies: [{ id: "react" }, { id: "discord/components/common/index" }]

     

       9
       12
        
         }

     

       10
       13
        
       };

+1 -1

packages/core-extensions/src/common/manifest.json

···

       4
       4
        
         "apiLevel": 2,

     

       5
       5
        
         "meta": {

     

       6
       6
        
           "name": "Common",

     

       7
       7
       -
           "tagline": "A *lot* of common clientmodding utilities from the Discord client",

     

       7
       7
       +
           "tagline": "Common client modding utilities for the Discord client",

     

       8
       8
        
           "authors": ["Cynosphere", "NotNite"],

     

       9
       9
        
           "tags": ["library"]

     

       10
       10
        
         },

+31

packages/core-extensions/src/common/webpackModules/icons.ts

···

       1
       1
       +
       import { Icons, IconSize } from "@moonlight-mod/types/coreExtensions/common";

     

       2
       2
       +
       import { tokens } from "@moonlight-mod/wp/discord/components/common/index";

     

       3
       3
       +
       

     

       4
       4
       +
       // This is defined in a Webpack module but we copy it here to be less breakage-prone

     

       5
       5
       +
       const sizes: Partial<Record<IconSize, number>> = {

     

       6
       6
       +
         xxs: 12,

     

       7
       7
       +
         xs: 16,

     

       8
       8
       +
         sm: 18,

     

       9
       9
       +
         md: 24,

     

       10
       10
       +
         lg: 32,

     

       11
       11
       +
         refresh_sm: 20

     

       12
       12
       +
       };

     

       13
       13
       +
       

     

       14
       14
       +
       export const icons: Icons = {

     

       15
       15
       +
         parseProps(props) {

     

       16
       16
       +
           // NOTE: var() fallback is non-standard behavior, just for safety reasons

     

       17
       17
       +
           const color = props?.color ?? tokens?.colors?.["INTERACTIVE_NORMAL"] ?? "var(--interactive-normal)";

     

       18
       18
       +
       

     

       19
       19
       +
           const size = sizes[props?.size ?? "md"];

     

       20
       20
       +
       

     

       21
       21
       +
           return {

     

       22
       22
       +
             // note: this default size is also non-standard behavior, just for safety

     

       23
       23
       +
             width: size ?? props?.width ?? sizes.md!,

     

       24
       24
       +
             height: size ?? props?.width ?? sizes.md!,

     

       25
       25
       +
       

     

       26
       26
       +
             fill: typeof color === "string" ? color : color.css,

     

       27
       27
       +
             className: props?.colorClass ?? ""

     

       28
       28
       +
           };

     

       29
       29
       +
         }

     

       30
       30
       +
       };

     

       31
       31
       +
       export default icons;

+22

packages/types/src/coreExtensions/common.ts

···

       1
       1
       +
       import type { IconProps, IconSize } from "@moonlight-mod/mappings/discord/components/common/index";

     

       2
       2
       +
       

     

       1
       3
        
       export type ErrorBoundaryProps = React.PropsWithChildren<{

     

       2
       4
        
         noop?: boolean;

     

       3
       5
        
         fallback?: React.FC<any>;

     
···

       9
       11
        
         error?: Error;

     

       10
       12
        
         componentStack?: string;

     

       11
       13
        
       };

     

       14
       14
       +
       

     

       15
       15
       +
       export type ErrorBoundary = React.ComponentClass<ErrorBoundaryProps, ErrorBoundaryState>;

     

       16
       16
       +
       

     

       17
       17
       +
       export type ParsedIconProps = {

     

       18
       18
       +
         width: number;

     

       19
       19
       +
         height: number;

     

       20
       20
       +
         fill: string;

     

       21
       21
       +
         className: string;

     

       22
       22
       +
       };

     

       23
       23
       +
       

     

       24
       24
       +
       export interface Icons {

     

       25
       25
       +
         /**

     

       26
       26
       +
          * Parse icon props into their actual width/height.

     

       27
       27
       +
          * @param props The icon props

     

       28
       28
       +
          */

     

       29
       29
       +
         parseProps(props?: IconProps): ParsedIconProps;

     

       30
       30
       +
       }

     

       31
       31
       +
       

     

       32
       32
       +
       // Re-export so extension developers don't need to depend on mappings

     

       33
       33
       +
       export type { IconProps, IconSize };

+4

packages/types/src/discord/require.ts

···

       1
       1
        
       import { AppPanels } from "../coreExtensions/appPanels";

     

       2
       2
        
       import { Commands } from "../coreExtensions/commands";

     

       3
       3
       +
       import { ErrorBoundary, Icons } from "../coreExtensions/common";

     

       3
       4
        
       import { DMList, MemberList, Messages } from "../coreExtensions/componentEditor";

     

       4
       5
        
       import { ContextMenu, EvilItemParser } from "../coreExtensions/contextMenu";

     

       5
       6
        
       import { Markdown } from "../coreExtensions/markdown";

     
···

       13
       14
        
       declare function WebpackRequire(id: "appPanels_appPanels"): AppPanels;

     

       14
       15
        
       

     

       15
       16
        
       declare function WebpackRequire(id: "commands_commands"): Commands;

     

       17
       17
       +
       

     

       18
       18
       +
       declare function WebpackRequire(id: "common_ErrorBoundary"): ErrorBoundary;

     

       19
       19
       +
       declare function WebpackRequire(id: "common_icons"): Icons;

     

       16
       20
        
       

     

       17
       21
        
       declare function WebpackRequire(id: "componentEditor_dmList"): DMList;

     

       18
       22
        
       declare function WebpackRequire(id: "componentEditor_memberList"): MemberList;

+10 -1

packages/types/src/import.d.ts

···

       10
       10
        
         export default commands;

     

       11
       11
        
       }

     

       12
       12
        
       

     

       13
       13
       -
       declare module "@moonlight-mod/wp/common_ErrorBoundary";

     

       13
       13
       +
       declare module "@moonlight-mod/wp/common_ErrorBoundary" {

     

       14
       14
       +
         import { CoreExtensions } from "@moonlight-mod/types";

     

       15
       15
       +
         const ErrorBoundary: CoreExtensions.Common.ErrorBoundary;

     

       16
       16
       +
         export = ErrorBoundary;

     

       17
       17
       +
       }

     

       18
       18
       +
       declare module "@moonlight-mod/wp/common_icons" {

     

       19
       19
       +
         import { CoreExtensions } from "@moonlight-mod/types";

     

       20
       20
       +
         export const icons: CoreExtensions.Common.Icons;

     

       21
       21
       +
         export default icons;

     

       22
       22
       +
       }

     

       14
       23
        
       declare module "@moonlight-mod/wp/common_stores";

     

       15
       24
        
       

     

       16
       25
        
       declare module "@moonlight-mod/wp/componentEditor_dmList" {