1.0.2

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "make-md",
   "name": "MAKE.md",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "minAppVersion": "0.16.0",
   "description": "Make.md gives you everything you need to organize and personalize your notes.",
   "author": "MAKE.md",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "make-md",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "make.md",
   "main": "main.js",
   "scripts": {

src/basics/cmExtensions.ts

@@ -19,10 +19,6 @@ import { tooltips } from "./tooltip";
 export const cmExtensions = (plugin: MakeBasicsPlugin, mobile: boolean) => {
   const extensions : Extension[] = [...editBlockExtensions()];
 
-  if (plugin.settings.makerMode) {
-
-
-
     extensions.push(
       ...[toggleMarkExtension, tooltips({ parent: document.body })]
     );
@@ -48,7 +44,6 @@ export const cmExtensions = (plugin: MakeBasicsPlugin, mobile: boolean) => {
         extensions.push(internalLinkToggle);
       } else {
         extensions.push(internalLinkHover(plugin));
-      }
     }
   }
 

src/basics/enactor/enactor.ts

@@ -12,6 +12,7 @@ export interface Enactor {
     ): void;
     selectLink(e: React.MouseEvent, onSelect: (path: string) => void): void;
     selectSpace(e: React.MouseEvent, onSelect: (path: string) => void): void;
+    pathExists(path: string): Promise<boolean>;
     selectImage(onSelect: (path: string) => void, win: Window): void;
     isSpace(path: string): boolean;
     loadExtensions(firstLoad: boolean): void;

src/basics/enactor/makemd.tsx

@@ -640,6 +640,9 @@ export class MakeMDEnactor implements Enactor {
     // }
     // menu.showAtMouseEvent(ev);
   }
+  pathExists(path: string) {
+    return this.superstate.spaceManager.pathExists(path);
+  }
   openPath(path: string, source?: HTMLElement) {
     const uri = this.uriByString(path);
     openPathInElement(

src/basics/enactor/obsidian.tsx

@@ -346,6 +346,9 @@ export class ObsidianEnactor implements Enactor {
   selectSpace(e: React.MouseEvent, onSelect: (path: string) => void) {
     return this.notify("Not implemented");
   }
+  pathExists(path: string) {
+    return this.plugin.app.vault.adapter.exists(path);
+  }
   selectImage(onSelect: (path: string) => void, win: Window) {
     return this.notify("Not implemented");
   }

src/basics/schemas/settings.ts

@@ -7,7 +7,6 @@ export const BasicDefaultSettings: MakeBasicsSettings = {
     mobileMakeBar: false,
     mobileSidepanel: false,
     inlineStyler: true,
-    makerMode: true,
     inlineStylerColors: false,
     editorFlow: true,
     internalLinkClickFlow: true,

src/basics/types/settings.ts

@@ -19,7 +19,6 @@ export interface MakeBasicsSettings {
   menuTriggerChar: string;
   inlineStickerMenu: boolean;
   emojiTriggerChar: string;
-  makerMode: boolean;
   dataviewInlineContext: boolean;
 
 }

src/basics/ui/UINote.tsx

@@ -39,9 +39,7 @@ export const UINote = forwardRef((props: NoteViewProps, ref) => {
 
     const path = props.plugin.enactor.uriByString(props.path, props.source);
 
-    const pathExists = await props.plugin.app.vault.adapter.exists(
-      path.basePath
-    );
+    const pathExists = await props.plugin.enactor.pathExists(path.basePath);
     const isFolder = props.plugin.enactor.isSpace(path.basePath);
     const filePath =
       isFolder && props.forceNote

src/core/react/components/MarkdownEditor/BannerView.tsx

@@ -42,6 +42,7 @@ export const BannerView = (props: {
       pathState?.metadata.property?.[props.superstate.settings.fmKeySticker]
         ?.length > 0;
     setHasSticker(hasSticker);
+
     setOffset(
       pathState?.metadata.property?.[
         props.superstate.settings.fmKeyBannerOffset
@@ -52,7 +53,7 @@ export const BannerView = (props: {
               pathState?.metadata.property?.[
                 props.superstate.settings.fmKeyBannerOffset
               ]
-            ) * 100
+            )
           ).toString()}%`
         : "center"
     );
@@ -166,7 +167,7 @@ export const BannerView = (props: {
         newValue = Math.min(newValue, 100);
         currentValue.current = newValue;
 
-        saveOffset(newValue);
+        setOffset(newValue + "%");
 
         return pos;
       });

src/core/react/components/SpaceView/Frames/EditorNodes/FlowNodeView.tsx

@@ -108,8 +108,8 @@ export const FlowNodeView = (
   };
   return (
     <div className="mk-node-flow">
-      {pathState ? (
-        !props.state?.styles?.["--mk-min-mode"] ? (
+      {pathState &&
+        (!props.state?.styles?.["--mk-min-mode"] ? (
           <div className="mk-node-link">
             <PathCrumb superstate={props.superstate} path={pathState.path}>
               {!hideToggle && (
@@ -123,7 +123,16 @@ export const FlowNodeView = (
           </div>
         ) : (
           <></>
-        )
+        ))}
+      {props.state && expanded && props.state?.props?.value?.length > 0 ? (
+        <PathView
+          id={id}
+          superstate={props.superstate}
+          path={pathState?.path ?? props.state?.props?.value}
+          containerRef={props.containerRef}
+          styles={{}}
+          readOnly={true}
+        ></PathView>
       ) : (
         selectionMode > FrameEditorMode.Read && (
           <div
@@ -144,16 +153,6 @@ export const FlowNodeView = (
           </div>
         )
       )}
-      {props.state && expanded && props.state?.props?.value?.length > 0 && (
-        <PathView
-          id={id}
-          superstate={props.superstate}
-          path={pathState?.path ?? props.state?.props?.value}
-          containerRef={props.containerRef}
-          styles={{}}
-          readOnly={true}
-        ></PathView>
-      )}
     </div>
   );
 };

src/core/spaceManager/filesystemAdapter/filesystemAdapter.ts

@@ -194,6 +194,24 @@ export class FilesystemSpaceAdapter implements SpaceAdapter {
       return [...this.fileSystem.allFiles().filter(f =>  type ? type.some(g =>  g == 'folder' ? f.isFolder : f.extension == g) : true).map(g => g.path).filter(f => !excludeSpacesPredicate(this.spaceManager.superstate.settings, f))];
     }
     public async pathExists (path: string) {
+      const uri = this.uriByPath(path);
+        if (uri.scheme == 'spaces') {
+          if (uri.authority.charAt(0) == '$') {
+          const builtIn = Object.keys(builtinSpaces).find(f => f == uri.authority.slice(1));
+            if (builtIn) {
+              return true;
+            }
+          }
+
+          if (uri.authority.charAt(0) == '#')
+          {
+            return true;
+          }
+          if (path == '/') {
+            return true;
+          }
+
+      }
       return this.fileSystem.fileExists(path)
     }
   public async createItemAtPath (parent: string, type: string, name: string, content?: any) {
@@ -831,7 +849,7 @@ const defaultSpaceTemplate = this.defaultFrame(path);
             const builtins = Object.keys(builtinSpaces).map(f => this.spaceManager.spaceInfoForPath(`spaces://$${f}`));
 
             const getAllTagContextFiles = () : SpaceInfo[] => this.readTags().map(f => fileSystemSpaceInfoFromTag(this.spaceManager, tagPathToTag(f))) as SpaceInfo[] ?? [];
-            const allTagSpaces = this.spaceManager.superstate.settings.enableDefaultSpaces ? getAllTagContextFiles() : [];
+            const allTagSpaces = getAllTagContextFiles();
             return [...builtins, ...allTagSpaces, ...allFolders]
           }
           return allFolders;

src/main.ts

@@ -646,6 +646,12 @@ this.markdownAdapter = new ObsidianMarkdownFiletypeAdapter(this);
     await this.loadSpaces();
     this.loadContext();
 
+    if (Object.keys(this.superstate.settings as Record<string, any>).some(f => f == "makerMode")){
+      this.superstate.settings.basics = (this.superstate.settings as any).makerMode;
+      delete (this.superstate.settings as any).makerMode;
+      this.saveSettings();
+    }
+
     if (this.superstate.settings.basics) {
     this.basics = new MakeBasicsPlugin(this);
     this.basics.loadBasics();

src/shared/i18n.ts

@@ -968,10 +968,7 @@ class T {
           name: "Mark Sans 🧪",
           desc: `Use the editor without Markdown.`,
         },
-        editorMakerMode: {
-          name: "Flow (Beta)",
-          desc: `An integrated and intuitive editor experience`,
-        },
+
         editorMakePlacholder: {
           name: "Flow Menu Hint Text",
           desc: `Show a hint text on how to open the Flow Menu Shortcut`,