commit 6f976bc493bd54bfaa54a350c85ab76768efca21 · notnite.com/moonlight

+4 -1

packages/core-extensions/src/contextMenu/index.tsx

···

       26
       26
        
       

     

       27
       27
        
       export const webpackModules: Record<string, ExtensionWebpackModule> = {

     

       28
       28
        
         contextMenu: {

     

       29
       29
       -
           dependencies: [{ ext: "spacepack", id: "spacepack" }, "MenuGroup:"]

     

       29
       29
       +
           dependencies: [

     

       30
       30
       +
             { ext: "spacepack", id: "spacepack" },

     

       31
       31
       +
             "Menu API only allows Items and groups of Items as children."

     

       32
       32
       +
           ]

     

       30
       33
        
         },

     

       31
       34
        
         evilMenu: {

     

       32
       35
        
           dependencies: [

+31 -4

packages/core-extensions/src/contextMenu/webpackModules/contextMenu.ts

···

       55
       55
        
         return el;

     

       56
       56
        
       }

     

       57
       57
        
       

     

       58
       58
       -
       const MenuElements = spacepack.findByCode("return null", "MenuGroup:")[0]

     

       59
       59
       -
         .exports;

     

       60
       60
       -
       

     

       61
       58
        
       module.exports = {

     

       62
       62
       -
         ...MenuElements,

     

       63
       59
        
         addItem,

     

       64
       60
        
         _patchMenu,

     

       65
       61
        
         _saveProps

     

       66
       62
        
       };

     

       63
       63
       +
       

     

       64
       64
       +
       // Unmangle Menu elements

     

       65
       65
       +
       const code =

     

       66
       66
       +
         spacepack.require.m[

     

       67
       67
       +
           spacepack.findByCode(

     

       68
       68
       +
             "Menu API only allows Items and groups of Items as children."

     

       69
       69
       +
           )[0].id

     

       70
       70
       +
         ].toString();

     

       71
       71
       +
       

     

       72
       72
       +
       let MangledMenu;

     

       73
       73
       +
       

     

       74
       74
       +
       const typeRegex = /if\(.\.type===(.)\.(.+?)\).+?type:"(.+?)"/g;

     

       75
       75
       +
       const typeMap: Record<string, string | undefined> = {

     

       76
       76
       +
         checkbox: "MenuCheckboxItem",

     

       77
       77
       +
         control: "MenuControlItem",

     

       78
       78
       +
         groupstart: "MenuGroup",

     

       79
       79
       +
         customitem: "MenuItem",

     

       80
       80
       +
         radio: "MenuRadioItem",

     

       81
       81
       +
         separator: "MenuSeparator"

     

       82
       82
       +
       };

     

       83
       83
       +
       

     

       84
       84
       +
       for (const [, modIdent, mangled, type] of code.matchAll(typeRegex)) {

     

       85
       85
       +
         if (!MangledMenu) {

     

       86
       86
       +
           const modId = code.match(new RegExp(`${modIdent}=.\\((\\d+?)\\)`))![1];

     

       87
       87
       +
           MangledMenu = spacepack.require(modId);

     

       88
       88
       +
         }

     

       89
       89
       +
       

     

       90
       90
       +
         const prop = typeMap[type];

     

       91
       91
       +
         if (!prop) continue;

     

       92
       92
       +
         module.exports[prop] = MangledMenu[mangled];

     

       93
       93
       +
       }

+5 -1

packages/core-extensions/src/contextMenu/webpackModules/evilMenu.ts

···

       16
       16
        
       );

     

       17
       17
        
       const exp: any = {};

     

       18
       18
        
       mod({}, exp, require);

     

       19
       19
       +
       const Menu = spacepack.findFunctionByStrings(

     

       20
       20
       +
         exp,

     

       21
       21
       +
         "Menu API only allows Items and groups of Items as children."

     

       22
       22
       +
       )!;

     

       19
       23
        
       module.exports = (el: any) => {

     

       20
       20
       -
         return exp.Menu({

     

       24
       24
       +
         return Menu({

     

       21
       25
        
           children: el,

     

       22
       26
        
           __contextMenu_evilMenu: true

     

       23
       27
        
         });