Merge pull request #734 from livewire/editor

Editor
livewire · Nov 25, 2024 · e787bb0 · e787bb0
2 parents 356c307 + 5c1295b
commit e787bb0
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 5 deletions.
diff --git a/dist/flux-lite.min.js b/dist/flux-lite.min.js
diff --git a/dist/manifest.json b/dist/manifest.json
@@ -1,3 +1,4 @@
 {
-  "/flux.js": "d3ef0a7e"
+  "/flux.js": "79511b07",
+  "/flux.css": "0e2b9c8b"
 }
diff --git a/src/AssetManager.php b/src/AssetManager.php
@@ -51,6 +51,24 @@ public function registerAssetRoutes()
                 ? $this->pretendResponseIsFile(__DIR__.'/../../flux-pro/dist/flux.min.js', 'text/javascript')
                 : $this->pretendResponseIsFile(__DIR__.'/../../flux/dist/flux-lite.min.js', 'text/javascript');
         });
+
+        Route::get('/flux/editor.css', function () {
+            if (! Flux::pro()) throw new \Exception('Flux Pro is required to use the Flux editor.');
+
+            return $this->pretendResponseIsFile(__DIR__.'/../../flux-pro/dist/editor.css', 'text/css');
+        });
+
+        Route::get('/flux/editor.js', function () {
+            if (! Flux::pro()) throw new \Exception('Flux Pro is required to use the Flux editor.');
+
+            return $this->pretendResponseIsFile(__DIR__.'/../../flux-pro/dist/editor.js', 'text/javascript');
+        });
+
+        Route::get('/flux/editor.min.js', function () {
+            if (! Flux::pro()) throw new \Exception('Flux Pro is required to use the Flux editor.');
+
+            return $this->pretendResponseIsFile(__DIR__.'/../../flux-pro/dist/editor.min.js', 'text/javascript');
+        });
     }
 
     public static function scripts()
@@ -74,11 +92,33 @@ public static function styles()
             ? json_decode(file_get_contents(__DIR__.'/../../flux-pro/dist/manifest.json'), true)
             : json_decode(file_get_contents(__DIR__.'/../../flux/dist/manifest.json'), true);
 
-        $versionHash = $manifest['/flux.js'];
+        $versionHash = $manifest['/flux.css'];
 
         return '<link rel="stylesheet" href="/flux/flux.css?id='. $versionHash . '">';
     }
 
+    public static function editorScripts()
+    {
+        $manifest = json_decode(file_get_contents(__DIR__.'/../../flux-pro/dist/manifest.json'), true);
+
+        $versionHash = $manifest['/editor.js'];
+
+        if (config('app.debug')) {
+            return '<script src="/flux/editor.js?id='. $versionHash . '" defer></script>';
+        } else {
+            return '<script src="/flux/editor.min.js?id='. $versionHash . '" defer></script>';
+        }
+    }
+
+    public static function editorStyles()
+    {
+        $manifest = json_decode(file_get_contents(__DIR__.'/../../flux-pro/dist/manifest.json'), true);
+
+        $versionHash = $manifest['/editor.css'];
+
+        return '<link rel="stylesheet" href="/flux/editor.css?id='. $versionHash . '">';
+    }
+
     public function pretendResponseIsFile($file, $contentType = 'application/javascript; charset=utf-8')
     {
         $lastModified = filemtime($file);

diff --git a/src/FluxManager.php b/src/FluxManager.php
@@ -55,6 +55,16 @@ public function scripts()
         return AssetManager::scripts();
     }
 
+    public function editorStyles()
+    {
+        return AssetManager::editorStyles();
+    }
+
+    public function editorScripts()
+    {
+        return AssetManager::editorScripts();
+    }
+
     public function classes($styles = null)
     {
         $builder = new ClassBuilder;

diff --git a/stubs/resources/views/flux/tooltip/index.blade.php b/stubs/resources/views/flux/tooltip/index.blade.php
@@ -1,14 +1,15 @@
 @props([
+    'interactive' => null,
     'position' => 'top',
     'align' => 'center',
     'content' => null,
     'kbd' => null,
 ])
 
-<ui-tooltip position="{{ $position }} {{ $align }}" {{ $attributes }} data-flux-tooltip>
+<ui-tooltip position="{{ $position }} {{ $align }}" {{ $attributes }} data-flux-tooltip @if ($interactive) interactive @endif>
     {{ $slot }}
 
     <?php if ($content !== null): ?>
-        <flux:tooltip.content>{{ $content }}</flux:tooltip.content>
+        <flux:tooltip.content :$kbd>{{ $content }}</flux:tooltip.content>
     <?php endif; ?>
 </ui-tooltip>