Change encoding for share url

MightyMoud · Feb 10, 2020 · 4267abd · 4267abd
1 parent b336b8b
commit 4267abd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -22,6 +22,7 @@
     "emotion-theming": "^10.0.27",
     "lodash": "^4.17.15",
     "lodash-es": "^4.17.15",
+    "lz-string": "^1.4.4",
     "prism-react-renderer": "^1.0.2",
     "react": "^16.12.0",
     "react-color": "^2.18.0",
@@ -63,6 +64,7 @@
   },
   "devDependencies": {
     "@types/lodash": "^4.14.149",
+    "@types/lz-string": "^1.3.33",
     "@types/prettier": "^1.19.0",
     "@types/react-color": "^3.0.1",
     "@types/react-redux": "^7.1.7",

diff --git a/src/utils/share.ts b/src/utils/share.ts
@@ -1,6 +1,8 @@
+import * as LZString from 'lz-string'
+
 export const createShareUrl = (components: IComponents) =>
-  `${document.location.host}/?share=${btoa(
-    unescape(encodeURIComponent(JSON.stringify(components))),
+  `${document.location.host}/?share=${LZString.compressToEncodedURIComponent(
+    JSON.stringify(components),
   )}`
 
 export const decodeShareUrl = (): IComponents | null => {
@@ -9,7 +11,7 @@ export const decodeShareUrl = (): IComponents | null => {
     const sharedData = searchParams.get('share')
 
     if (sharedData) {
-      return JSON.parse(decodeURIComponent(escape(atob(sharedData))))
+      return JSON.parse(LZString.decompressFromEncodedURIComponent(sharedData))
     }
   } catch (e) {
     console.log(e)

diff --git a/yarn.lock b/yarn.lock
@@ -1863,6 +1863,11 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.149.tgz#1342d63d948c6062838fbf961012f74d4e638440"
   integrity sha512-ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ==
 
+"@types/lz-string@^1.3.33":
+  version "1.3.33"
+  resolved "https://registry.yarnpkg.com/@types/lz-string/-/lz-string-1.3.33.tgz#de2d6105ea7bcaf67dd1d9451d580700d30473fc"
+  integrity sha512-yWj3OnlKlwNpq9+Jh/nJkVAD3ta8Abk2kIRpjWpVkDlAD43tn6Q6xk5hurp84ndcq54jBDBGCD/WcIR0pspG0A==
+
 "@types/minimatch@*", "@types/minimatch@3.0.3", "@types/minimatch@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"