Merge pull request #2 from codebar-ag/feature-updates

Fix Line Folding
codebar-ag · Mar 23, 2024 · e53f387 · e53f387
2 parents 3f18734 + 6f59fbc
commit e53f387
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -83,10 +83,7 @@
         "laravel": {
             "providers": [
                 "CodebarAg\\FilamentJsonField\\FilamentJsonFieldServiceProvider"
-            ],
-            "aliases": {
-                "FilamentJsonField": "CodebarAg\\FilamentJsonField\\Facades\\FilamentJsonField"
-            }
+            ]
         }
     },
     "minimum-stability": "dev",

diff --git a/resources/views/forms/components/json-input.blade.php b/resources/views/forms/components/json-input.blade.php
@@ -5,7 +5,7 @@
 >
     <div
         x-data="{ state: $wire.{{ $applyStateBindingModifiers("\$entangle('{$getStatePath()}')") }} }"
-        style="position: relative; border-radius: 0.375rem;"
+        style="position: relative; border-radius: 0.375rem; overflow-x: scroll;"
         x-cloak
     >
         <div
@@ -34,13 +34,13 @@
 
                             // Get open / close token
                             var startToken = '{', endToken = '}';
-                            var prevLine = codeMirrorEditor.getLine(from.line);
+                            var prevLine = {{ str_replace('.', '', $getId()) }}.getLine(from.line);
                             if (prevLine.lastIndexOf('[') > prevLine.lastIndexOf('{')) {
                                 startToken = '[', endToken = ']';
                             }
 
                             // Get json content
-                            var internal = codeMirrorEditor.getRange(from, to);
+                            var internal = {{ str_replace('.', '', $getId()) }}.getRange(from, to);
                             var toParse = startToken + internal + endToken;
 
                             // Get key count

diff --git a/resources/views/infolists/components/json-entry.blade.php b/resources/views/infolists/components/json-entry.blade.php
@@ -1,6 +1,6 @@
 <x-dynamic-component :component="$getEntryWrapperView()" :entry="$entry">
     <div
-        style="position: relative; border-radius: 0.375rem;"
+        style="position: relative; border-radius: 0.375rem; overflow-x: scroll;"
         x-cloak
     >
         <div
@@ -31,13 +31,13 @@
 
                             // Get open / close token
                             var startToken = '{', endToken = '}';
-                            var prevLine = codeMirrorEditor.getLine(from.line);
+                            var prevLine = {{ str_replace('.', '', $getId()) }}.getLine(from.line);
                             if (prevLine.lastIndexOf('[') > prevLine.lastIndexOf('{')) {
                                 startToken = '[', endToken = ']';
                             }
 
                             // Get json content
-                            var internal = codeMirrorEditor.getRange(from, to);
+                            var internal = {{ str_replace('.', '', $getId()) }}.getRange(from, to);
                             var toParse = startToken + internal + endToken;
 
                             // Get key count