🐎 Improve: Enhance existing functionality

CofficLab · Jan 17, 2025 · eb75c43 · eb75c43
1 parent e6dd954
commit eb75c43
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 23 deletions.
diff --git a/Sources/JuiceEditorKit/Server/HTTPServer.swift b/Sources/JuiceEditorKit/Server/HTTPServer.swift
@@ -7,7 +7,7 @@ import Vapor
 public class HTTPServer: ObservableObject, SuperThread {
     public var app: Application?
     public let directoryPath: String
-    public let isDevMode = true
+    public let isDevMode = false
     public var port: Int = 49493
     public let vueDevServerURL = "http://localhost:5173"
     public var delegate: EditorDelegate
@@ -127,5 +127,5 @@ extension HTTPServer {
 #Preview {
     EditorView(verbose: true)
         .frame(height: 1000)
-        .frame(width: 700)
+        .frame(width: 1700)
 }
diff --git a/Sources/JuiceEditorKit/Views/EditorView.swift b/Sources/JuiceEditorKit/Views/EditorView.swift
@@ -50,7 +50,7 @@ extension EditorDelegate {
     }
 
     public func onReady() {
-        warning("Editor Ready")
+        warning("EditorDelegate: Editor Ready")
     }
 
     public func onUpdateNodes(_ nodes: [EditorNode]) {
@@ -80,6 +80,6 @@ public struct DefaultDelegate: EditorDelegate {}
 
 #Preview {
     EditorView(verbose: true)
-        .frame(height: 1000)
-        .frame(width: 700)
+        .frame(height: 1500)
+        .frame(width: 900)
 }
diff --git a/Sources/JuiceEditorKit/Views/EditorViewApi.swift b/Sources/JuiceEditorKit/Views/EditorViewApi.swift
@@ -31,8 +31,16 @@ public extension EditorView {
         try await run("window.editor.disableFloatingMenu()")
     }
 
-    func disableFlotingMenuAndBubbleMenu() async throws -> Any {
-        try await run("window.editor.disableFlotingMenuAndBubbleMenu()")
+    @discardableResult
+    func disableDebugBar() async throws -> Any {
+        debug("disableDebugBar")
+        let result = try await run("window.editor.disableDebugBar()")
+        debug("disableDebugBar result: \(result)")
+        return result
+    }
+
+    func disableFloatingMenuAndBubbleMenu() async throws -> Any {
+        try await run("window.editor.disableFloatingMenuAndBubbleMenu()")
     }
 
     func disableEdit() async throws -> Any {

diff --git a/Sources/JuiceEditorKit/Views/EditorViewEvent.swift b/Sources/JuiceEditorKit/Views/EditorViewEvent.swift
@@ -11,6 +11,8 @@ extension EditorView {
             do {
                 try await self.setChatApi(server.chatApi)
                 try await self.setDrawLink(server.drawIoLink)
+                try await self.disableFloatingMenu()
+                try await self.disableDebugBar()
 
                 self.delegate.onReady()
             } catch {
@@ -132,7 +134,6 @@ extension EditorView {
         } else {
         }
     }
-
 }
 
 #Preview {

diff --git a/src/extensions/DebugBar/DebugBar.ts b/src/extensions/DebugBar/DebugBar.ts
@@ -58,6 +58,13 @@ const DebugBar = TiptapExtension.create({
 
             disableDebugBar: () => ({ }) => {
                 this.storage.enabled = false
+
+                if (this.storage.verbose) {
+                    this.editor.commands.appendLog(this.storage.title, '🚀 disableDebugBar')
+                    console.log('disableDebugBar')
+                }
+
+                this.editor.commands.closeDebugBar()
                 return true
             },
 
@@ -88,6 +95,10 @@ const DebugBar = TiptapExtension.create({
                     return true
                 }
 
+                if (this.storage.verbose) {
+                    console.log('showDebugBar')
+                }
+
                 const mountPoint = document.createElement('div');
                 mountPoint.id = this.options.mountPointId;
                 mountPoint.style.position = 'fixed';
@@ -99,20 +110,14 @@ const DebugBar = TiptapExtension.create({
                 mountPoint.style.justifyContent = 'center';
                 mountPoint.style.zIndex = '9999';
                 mountPoint.style.transition = 'all 0.4s cubic-bezier(0.4, 0, 0.2, 1)';
-                mountPoint.style.opacity = '0';
+                mountPoint.style.opacity = '1';
                 mountPoint.style.transformOrigin = 'bottom';
                 mountPoint.style.transform = 'scale(0.95)';
                 mountPoint.style.backgroundColor = 'rgba(0, 0, 0, 0)';
 
                 let editorElement = this.editor.options.element
                 editorElement.appendChild(mountPoint);
 
-                requestAnimationFrame(() => {
-                    mountPoint.style.opacity = '1';
-                    mountPoint.style.transform = 'scale(1)';
-                    mountPoint.style.backgroundColor = 'rgba(0, 0, 0, 0.5)';
-                });
-
                 const app = createApp({
                     render() {
                         return h(DebugView, {

diff --git a/src/extensions/DebugBar/DebugView.vue b/src/extensions/DebugBar/DebugView.vue
@@ -34,7 +34,7 @@ onMounted(() => {
 })
 
 function closeMessage() {
-    props.editor.commands.toggleDebugBar()
+    props.editor.commands.disableDebugBar()
 }
 
 function toggleTree() {

diff --git a/src/extensions/SmartAlert/SmartAlert.ts b/src/extensions/SmartAlert/SmartAlert.ts
@@ -35,19 +35,13 @@ const SmartAlert = TiptapExtension.create({
                 mountPoint.style.alignItems = 'center';
                 mountPoint.style.zIndex = '9999';
                 mountPoint.style.transition = 'all 0.4s cubic-bezier(0.4, 0, 0.2, 1)';
-                mountPoint.style.opacity = '0';
+                mountPoint.style.opacity = '1';
                 mountPoint.style.transform = 'scale(0.95)';
                 mountPoint.style.backgroundColor = 'rgba(0, 0, 0, 0)';
 
                 let editorElement = this.editor.options.element
                 editorElement.appendChild(mountPoint);
 
-                requestAnimationFrame(() => {
-                    mountPoint.style.opacity = '1';
-                    mountPoint.style.transform = 'scale(1)';
-                    mountPoint.style.backgroundColor = 'rgba(0, 0, 0, 0.5)';
-                });
-
                 const app = createApp({
                     render() {
                         return h(Component, {

diff --git a/src/pages/Root.ce.vue b/src/pages/Root.ce.vue
@@ -27,6 +27,7 @@ const editor = new EditorVue({
         publicEditor.options.onCreate?.(publicEditor)
         editor.commands.boot()
         publicEditor.options.onBooted?.(publicEditor)
+        updateLoadingState()
     },
     onContentError: (error) => {
         publicEditor.options.onContentError?.()