update to use createSelector

src/components/panes/configure-panes/keycode.tsx

@@ -30,6 +30,7 @@ import {
 } from 'src/store/definitionsSlice';
 import {getSelectedConnectedDevice,
         getSelectedKeyboardAPI,
+        getMacroCount,
 } from 'src/store/devicesSlice';
 import {
   getSelectedKey,
@@ -149,21 +150,13 @@ export const KeycodePane: FC = () => {
   const disableFastRemap = useAppSelector(getDisableFastRemap);
   const selectedKeyDefinitions = useAppSelector(getSelectedKeyDefinitions);
   const {basicKeyToByte} = useAppSelector(getBasicKeyToByte);
-  const [numMacros, setNumMacros] = useState(16);
-
-  const api = useAppSelector(getSelectedKeyboardAPI);
-  if (!api) {
-    return null;
-  }
-  api.getMacroCount().then((nMacros) =>{
-    setNumMacros(nMacros);
-    console.log("numMacros: ", numMacros);
-  })
-  // let numMacros = async() => await new Promise(resolve => api.getMacroCount());
+  const macroCount = useAppSelector(getMacroCount);
 
+  if (!macroCount) return null;
+  console.log(macroCount);
   const KeycodeCategories = useMemo(
-    () => generateKeycodeCategories(basicKeyToByte, numMacros),
-    [basicKeyToByte, numMacros],
+    () => generateKeycodeCategories(basicKeyToByte, macroCount),
+    [basicKeyToByte, macroCount],
   );
 
   // TODO: improve typing so we can get rid of this

src/store/devicesSlice.ts

@@ -92,3 +92,11 @@ export const getSelectedKeyboardAPI = createSelector(
   getSelectedDevicePath,
   (path) => path && new KeyboardAPI(path),
 );
+export const getMacroCount = createSelector(
+  getSelectedKeyboardAPI,
+  async (api) => {
+    if (!api) return null;
+    const value:number = await api.getMacroCount();
+    return value;
+  },
+);

src/utils/key.ts

@@ -465,7 +465,6 @@ function buildLayerMenu(): IKeycodeMenu {
 }
 
 function generateMacros(numMacros: number = 16): IKeycode[] {
-  const macroTemplate: IKeycode = {name: 'M0', code: 'MACRO(0)', title: 'Macro 0'};
   let res: IKeycode[] = [];
   for (let idx = 0; idx < numMacros; idx++) {
     const newName = `M${idx}`;