git.iko.soy/bridge
on master help sign in
Use latest urbit-sigil-js
commite1c312757858ad58251fe9059bab860905fd4964 authorFang <git@fang.io> dateFri 19 Jul 2019, 01:47 (7 years ago) parente94ff4f
4 files changed+129−29
compare with master
unifiedsplit
package-lock.json+112−9 package.json+1−1 src/components/InputSigil.js+4−4 src/components/Sigil.js+12−15
package-lock.json+112−9
@@ -2175,7 +2175,8 @@
21752175 "version": "github:urbit/sigil-js#03c880ff17a5816d78f659f44cb7df44e0a0c097",
21762176 "from": "github:urbit/sigil-js",
21772177 "requires": {
2178− "lodash": "^4.17.10",
2178+ "react": "^16.8.6",
2179+ "svgson": "^4.0.0",
21792180 "transformation-matrix": "^1.14.0"
21802181 }
21812182 },
@@ -5358,6 +5359,15 @@
53585359 "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
53595360 "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
53605361 },
5362+ "deep-rename-keys": {
5363+ "version": "0.2.1",
5364+ "resolved": "https://registry.npmjs.org/deep-rename-keys/-/deep-rename-keys-0.2.1.tgz",
5365+ "integrity": "sha1-7eeFN9emaivmFRfir5Vtf1ij8dg=",
5366+ "requires": {
5367+ "kind-of": "^3.0.2",
5368+ "rename-keys": "^1.1.2"
5369+ }
5370+ },
53615371 "default-gateway": {
53625372 "version": "4.2.0",
53635373 "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
@@ -12587,6 +12597,51 @@
1258712597 "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
1258812598 "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
1258912599 },
12600+ "omit-deep": {
12601+ "version": "0.3.0",
12602+ "resolved": "https://registry.npmjs.org/omit-deep/-/omit-deep-0.3.0.tgz",
12603+ "integrity": "sha1-IcivNJm8rdKWUaIyy8rLxSRF6+w=",
12604+ "requires": {
12605+ "is-plain-object": "^2.0.1",
12606+ "unset-value": "^0.1.1"
12607+ },
12608+ "dependencies": {
12609+ "has-value": {
12610+ "version": "0.3.1",
12611+ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
12612+ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
12613+ "requires": {
12614+ "get-value": "^2.0.3",
12615+ "has-values": "^0.1.4",
12616+ "isobject": "^2.0.0"
12617+ },
12618+ "dependencies": {
12619+ "isobject": {
12620+ "version": "2.1.0",
12621+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
12622+ "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
12623+ "requires": {
12624+ "isarray": "1.0.0"
12625+ }
12626+ }
12627+ }
12628+ },
12629+ "has-values": {
12630+ "version": "0.1.4",
12631+ "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
12632+ "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
12633+ },
12634+ "unset-value": {
12635+ "version": "0.1.2",
12636+ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-0.1.2.tgz",
12637+ "integrity": "sha1-UGgQuGfyfCpabpsEgzYx9t5Y0xA=",
12638+ "requires": {
12639+ "has-value": "^0.3.1",
12640+ "isobject": "^3.0.0"
12641+ }
12642+ }
12643+ }
12644+ },
1259012645 "on-finished": {
1259112646 "version": "2.3.0",
1259212647 "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -14774,6 +14829,11 @@
1477414829 "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
1477514830 "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
1477614831 },
14832+ "rename-keys": {
14833+ "version": "1.2.0",
14834+ "resolved": "https://registry.npmjs.org/rename-keys/-/rename-keys-1.2.0.tgz",
14835+ "integrity": "sha512-U7XpAktpbSgHTRSNRrjKSrjYkZKuhUukfoBlXWXUExCAqhzh1TU3BDRAfJmarcl5voKS+pbKU9MvyLWKZ4UEEg=="
14836+ },
1477714837 "renderkid": {
1477814838 "version": "2.0.3",
1477914839 "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
@@ -15661,14 +15721,6 @@
1566115721 "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
1566215722 "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
1566315723 },
15664− "sigil-js": {
15665− "version": "github:urbit/sigil-js#f7f29c5a4e2abc5207e7bd5f8dba8a0b3c18044d",
15666− "from": "github:urbit/sigil-js#f7f29c5",
15667− "requires": {
15668− "lodash": "^4.17.10",
15669− "transformation-matrix": "^1.14.0"
15670− }
15671− },
1567215724 "signal-exit": {
1567315725 "version": "3.0.2",
1567415726 "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
@@ -16639,6 +16691,16 @@
1663916691 }
1664016692 }
1664116693 },
16694+ "svgson": {
16695+ "version": "4.0.0",
16696+ "resolved": "https://registry.npmjs.org/svgson/-/svgson-4.0.0.tgz",
16697+ "integrity": "sha512-4xmo8f7IREKzSimfKLxdFmffWn8ngstS6EYC8Hqoo4twyzLxc1BETdSBz++wx8k9s8EH8hLNi+VoH+7T2pkIgw==",
16698+ "requires": {
16699+ "deep-rename-keys": "^0.2.1",
16700+ "omit-deep": "0.3.0",
16701+ "xml-reader": "2.4.3"
16702+ }
16703+ },
1664216704 "swarm-js": {
1664316705 "version": "0.1.39",
1664416706 "resolved": "https://registry.npmjs.org/swarm-js/-/swarm-js-0.1.39.tgz",
@@ -17474,6 +17536,16 @@
1747417536 "lodash": "^4.17.11"
1747517537 }
1747617538 },
17539+ "urbit-sigil-js": {
17540+ "version": "1.3.2",
17541+ "resolved": "https://registry.npmjs.org/urbit-sigil-js/-/urbit-sigil-js-1.3.2.tgz",
17542+ "integrity": "sha512-cYmytvhsqYFo1HQSsfsjahJ6/DOW06ZAYEPOQD/OHKfeis3veVBZNOuM5PpAskDb5n68aVq1Xhx2oKno/TZ+LQ==",
17543+ "requires": {
17544+ "react": "^16.8.6",
17545+ "svgson": "^4.0.0",
17546+ "transformation-matrix": "^1.14.0"
17547+ }
17548+ },
1747717549 "uri-js": {
1747817550 "version": "4.2.2",
1747917551 "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -19356,11 +19428,42 @@
1935619428 "cookiejar": "^2.1.1"
1935719429 }
1935819430 },
19431+ "xml-lexer": {
19432+ "version": "0.2.2",
19433+ "resolved": "https://registry.npmjs.org/xml-lexer/-/xml-lexer-0.2.2.tgz",
19434+ "integrity": "sha1-UYGTpKozTVj8fSSLVJB5uJkH4EY=",
19435+ "requires": {
19436+ "eventemitter3": "^2.0.0"
19437+ },
19438+ "dependencies": {
19439+ "eventemitter3": {
19440+ "version": "2.0.3",
19441+ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
19442+ "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="
19443+ }
19444+ }
19445+ },
1935919446 "xml-name-validator": {
1936019447 "version": "3.0.0",
1936119448 "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
1936219449 "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="
1936319450 },
19451+ "xml-reader": {
19452+ "version": "2.4.3",
19453+ "resolved": "https://registry.npmjs.org/xml-reader/-/xml-reader-2.4.3.tgz",
19454+ "integrity": "sha1-n4EMr3xCWlqvuEixxFEDyecddTA=",
19455+ "requires": {
19456+ "eventemitter3": "^2.0.0",
19457+ "xml-lexer": "^0.2.2"
19458+ },
19459+ "dependencies": {
19460+ "eventemitter3": {
19461+ "version": "2.0.3",
19462+ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
19463+ "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="
19464+ }
19465+ }
19466+ },
1936419467 "xmlchars": {
1936519468 "version": "1.3.1",
1936619469 "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-1.3.1.tgz",
package.json+1−1
@@ -42,10 +42,10 @@
4242 "react-scripts": "3.0.1",
4343 "react-teleporter": "^1.1.0",
4444 "secp256k1": "^3.5.2",
45− "sigil-js": "github:urbit/sigil-js#f7f29c5",
4645 "trezor-connect": "^7.0.1",
4746 "urbit-key-generation": "^0.16.0",
4847 "urbit-ob": "^4.0.1",
48+ "urbit-sigil-js": "^1.3.2",
4949 "web3": "1.0.0-beta.54",
5050 "web3-utils": "^1.0.0-beta.52"
5151 },
src/components/InputSigil.js+4−4
@@ -6,18 +6,18 @@ import AspectRatio from './AspectRatio';
66
77const selectColorway = (pass, fail, focused) => {
88 if (pass) {
9− return ['#FFFFFF', '#2AA779'];
9+ return ['#2AA779', '#FFFFFF'];
1010 }
1111
1212 if (focused) {
13− return ['#FFFFFF', '#4330FC'];
13+ return ['#4330FC', '#FFFFFF'];
1414 }
1515
1616 if (fail) {
17− return ['#FFFFFF', '#F8C134'];
17+ return ['#F8C134', '#FFFFFF'];
1818 }
1919
20− return ['#FFFFFF', '#7F7F7F'];
20+ return ['#7F7F7F', '#FFFFFF'];
2121};
2222
2323export default function InputSigil({
src/components/Sigil.js+12−15
@@ -1,18 +1,15 @@
1−import { pour } from 'sigil-js';
2−
3−import ReactSVGComponents from './ReactSVGComponents';
1+import React from 'react';
2+import { sigil, reactRenderer } from 'urbit-sigil-js';
43
54export default function Sigil({ patp, size, colorway, ...rest }) {
6− try {
7− // https://github.com/urbit/sigil-js/issues/31
8− return pour({
9− renderer: ReactSVGComponents,
10− patp,
11− size,
12− colorway,
13− ...rest,
14− });
15− } catch {
16− return null;
17− }
5+ return (
6+ <div>
7+ {sigil({
8+ patp: patp,
9+ renderer: reactRenderer,
10+ size: size,
11+ colors: colorway,
12+ })}
13+ </div>
14+ );
1815}