fix #1558: url not wrapping on Chrome in mode view, font-size incre…

…asing on mobile Webview
josdejong · Nov 8, 2023 · 7b67e7b · 7b67e7b
1 parent b28832a
commit 7b67e7b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -3,6 +3,12 @@
 https://github.com/josdejong/jsoneditor
 
 
+## not yet published, version 9.10.4
+
+- Fix #1558: url not wrapping on Chrome in mode `view`, font-size increasing
+  on mobile Webview.
+
+
 ## 2023-09-21, version 9.10.3
 
 - Fix #1550: trimming zero in front of a number (#1549). Thanks @DarkFisk.

diff --git a/src/scss/jsoneditor/_editor.scss b/src/scss/jsoneditor/_editor.scss
@@ -12,6 +12,7 @@
 }
 div.jsoneditor-field,
 div.jsoneditor-value,
+a.jsoneditor-value,
 div.jsoneditor-readonly,
 div.jsoneditor-default {
   border: 1px solid transparent;
@@ -21,6 +22,8 @@ div.jsoneditor-default {
   padding: 2px;
   margin: 1px;
   word-wrap: break-word;
+  word-break: break-word;
+  overflow-wrap: break-word;
   float: left;
 }
 div.jsoneditor-field p,
@@ -29,7 +32,6 @@ div.jsoneditor-value p {
 }
 div {
   &.jsoneditor-value {
-    word-break: break-word;
     &.jsoneditor-empty {
       &::after {
         content: "value";

diff --git a/src/scss/jsoneditor/_reset.scss b/src/scss/jsoneditor/_reset.scss
@@ -1,5 +1,8 @@
 .jsoneditor,
 .jsoneditor-modal {
+  -webkit-text-size-adjust: none;
+  text-size-adjust: none;
+
   input,
   input:not([type]),
   input[type="text"],

diff --git a/test/test_build.html b/test/test_build.html
@@ -103,7 +103,16 @@
       {
         "<button onclick=alert('oopsie!!!')>test xss</button>": "xss?"
       }
-    ]
+    ],
+    "wrap": {
+      "a" : "123456789012345678901234567890123456789001234567890",
+      "b" :
+        {
+          "c" : "123456789012345678901234567890123456789012345678",
+          "d" : "1234567890123456789012345678901234567890123456789012345",
+          "url": "https://github.com/josdejong/jsoneditor/issues/1558"
+        }
+    }
   };
 
   editorTest = new JSONEditor(container, options, json);