diff --git a/pkg/interface/package-lock.json b/pkg/interface/package-lock.json index 81929bf03..4a86835eb 100644 --- a/pkg/interface/package-lock.json +++ b/pkg/interface/package-lock.json @@ -1709,8 +1709,9 @@ "integrity": "sha512-3OPSdf9cejP/TSzWXuBaYbzLtAfBzQnc75SlPLkoPfwpxnv1Bvy9hiWngLY0WnKRR6lMOldnkYQCCuNWeDibYQ==" }, "@tlon/indigo-react": { - "version": "github:urbit/indigo-react#30c04b3369076ef8086d4f479a890500a1263510", - "from": "github:urbit/indigo-react#lf/1.2.8", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@tlon/indigo-react/-/indigo-react-1.2.8.tgz", + "integrity": "sha512-u8qRWGLsMyB+fVIW+E4TK3EyQJJEPzLRVwPpnhPxPgWoAUe31BWKJ/zJXoP+gqt7KxanTL4lHu1n10MeWKY1Dg==", "requires": { "@reach/menu-button": "^0.10.5", "react": "^16.13.1", @@ -1718,12 +1719,22 @@ }, "dependencies": { "tslib": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz", - "integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.2.tgz", + "integrity": "sha512-wAH28hcEKwna96/UacuWaVspVLkg4x1aDM9JlzqaQTOFczCktkVAb5fmXChgandR1EraDPs2w8P+ozM+oafwxg==" } } }, + "@tlon/sigil-js": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@tlon/sigil-js/-/sigil-js-1.4.2.tgz", + "integrity": "sha512-meb0q0kf4S34oTKDulRMfVU6Wq/9lSOALeQil4EWttL72Lae9Fznsm+ix3tgT69g1xUpjeZIB+vqGOtAFhZX3g==", + "requires": { + "invariant": "^2.2.4", + "svgson": "^4.0.0", + "transformation-matrix": "2.1.1" + } + }, "@types/anymatch": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz", @@ -9874,17 +9885,6 @@ "lodash.isequal": "^4.5.0" } }, - "urbit-sigil-js": { - "version": "1.3.13", - "resolved": "https://registry.npmjs.org/urbit-sigil-js/-/urbit-sigil-js-1.3.13.tgz", - "integrity": "sha512-g6tC7K65O/4rMCd9/Cy+BVyVSzC3GNjfd0R4EaXEl4aXnjRIiIkD0xkZl56yzLwNk6W9bniDQJALcGPxY3IROw==", - "requires": { - "invariant": "^2.2.4", - "react": "^16.8.6", - "svgson": "^4.0.0", - "transformation-matrix": "2.1.1" - } - }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", diff --git a/pkg/interface/package.json b/pkg/interface/package.json index 5c7608d72..226978431 100644 --- a/pkg/interface/package.json +++ b/pkg/interface/package.json @@ -9,7 +9,8 @@ "@reach/menu-button": "^0.10.5", "@reach/tabs": "^0.10.5", "@tlon/indigo-light": "^1.0.3", - "@tlon/indigo-react": "urbit/indigo-react#lf/1.2.8", + "@tlon/indigo-react": "^1.2.8", + "@tlon/sigil-js": "^1.4.2", "aws-sdk": "^2.726.0", "classnames": "^2.2.6", "codemirror": "^5.55.0", @@ -20,6 +21,7 @@ "moment": "^2.20.1", "mousetrap": "^1.6.5", "mousetrap-global-bind": "^1.1.0", + "normalize-wheel": "1.0.1", "oembed-parser": "^1.4.1", "prop-types": "^15.7.2", "react": "^16.5.2", @@ -39,9 +41,7 @@ "styled-system": "^5.1.5", "suncalc": "^1.8.0", "urbit-ob": "^5.0.0", - "urbit-sigil-js": "^1.3.2", - "yup": "^0.29.3", - "normalize-wheel": "1.0.1" + "yup": "^0.29.3" }, "devDependencies": { "@babel/core": "^7.9.0", diff --git a/pkg/interface/src/logic/lib/sigil.js b/pkg/interface/src/logic/lib/sigil.js index 8e5066eec..cfe0ee752 100644 --- a/pkg/interface/src/logic/lib/sigil.js +++ b/pkg/interface/src/logic/lib/sigil.js @@ -1,5 +1,5 @@ import React, { memo } from 'react'; -import { sigil, reactRenderer } from 'urbit-sigil-js'; +import { sigil, reactRenderer } from '@tlon/sigil-js'; export const foregroundFromBackground = (background) => { const rgb = { diff --git a/pkg/interface/src/views/App.js b/pkg/interface/src/views/App.js index 3b29b4303..e78e4707b 100644 --- a/pkg/interface/src/views/App.js +++ b/pkg/interface/src/views/App.js @@ -3,7 +3,7 @@ import 'react-hot-loader'; import * as React from 'react'; import { BrowserRouter as Router, withRouter } from 'react-router-dom'; import styled, { ThemeProvider, createGlobalStyle } from 'styled-components'; -import { sigil as sigiljs, stringRenderer } from 'urbit-sigil-js'; +import { sigil as sigiljs, stringRenderer } from '@tlon/sigil-js'; import Helmet from 'react-helmet'; import Mousetrap from 'mousetrap'; diff --git a/pkg/interface/src/views/apps/launch/app.js b/pkg/interface/src/views/apps/launch/app.js index 09efbb006..9051a87a7 100644 --- a/pkg/interface/src/views/apps/launch/app.js +++ b/pkg/interface/src/views/apps/launch/app.js @@ -66,7 +66,7 @@ export default class LaunchApp extends React.Component { > diff --git a/pkg/interface/src/views/components/StatusBar.js b/pkg/interface/src/views/components/StatusBar.js index 670c7e163..a2af7794f 100644 --- a/pkg/interface/src/views/components/StatusBar.js +++ b/pkg/interface/src/views/components/StatusBar.js @@ -22,7 +22,7 @@ const StatusBar = (props) => { > props.history.push('/')}> - + props.api.local.setOmnibox()}> diff --git a/pkg/interface/src/views/components/leap/OmniboxResult.js b/pkg/interface/src/views/components/leap/OmniboxResult.js index 03f610317..0949a1b96 100644 --- a/pkg/interface/src/views/components/leap/OmniboxResult.js +++ b/pkg/interface/src/views/components/leap/OmniboxResult.js @@ -33,9 +33,8 @@ export class OmniboxResult extends Component { if (defaultApps.includes(icon.toLowerCase()) || icon.toLowerCase() === 'links') { icon = (icon === 'Dojo') ? 'ChevronEast' : icon; icon = (icon === 'Link') ? 'Links' : icon; - const color = (icon === 'ChevronEast') ? iconFill : 'transparent'; - const stroke = (icon === 'ChevronEast') ? 'transparent' : iconFill; - graphic = ; + + graphic = ; } else if (icon === 'logout') { graphic = ; } else if (icon === 'profile') { diff --git a/pkg/interface/src/views/landscape/components/GroupSwitcher.tsx b/pkg/interface/src/views/landscape/components/GroupSwitcher.tsx index 2b626caec..f320d041b 100644 --- a/pkg/interface/src/views/landscape/components/GroupSwitcher.tsx +++ b/pkg/interface/src/views/landscape/components/GroupSwitcher.tsx @@ -103,8 +103,7 @@ export function GroupSwitcher(props: { @@ -115,11 +114,11 @@ export function GroupSwitcher(props: { associations={props.associations} /> - + New Group - + Join Group {workspace.type === "group" && ( @@ -127,8 +126,7 @@ export function GroupSwitcher(props: { Participants @@ -136,8 +134,7 @@ export function GroupSwitcher(props: { Settings diff --git a/pkg/interface/src/views/landscape/components/Sidebar/SidebarItem.tsx b/pkg/interface/src/views/landscape/components/Sidebar/SidebarItem.tsx index ed3e9aab7..7c4f55e6b 100644 --- a/pkg/interface/src/views/landscape/components/Sidebar/SidebarItem.tsx +++ b/pkg/interface/src/views/landscape/components/Sidebar/SidebarItem.tsx @@ -100,8 +100,7 @@ export function SidebarItem(props: { diff --git a/pkg/interface/src/views/landscape/components/Sidebar/SidebarListHeader.tsx b/pkg/interface/src/views/landscape/components/Sidebar/SidebarListHeader.tsx index e185a9551..6f243aea7 100644 --- a/pkg/interface/src/views/landscape/components/Sidebar/SidebarListHeader.tsx +++ b/pkg/interface/src/views/landscape/components/Sidebar/SidebarListHeader.tsx @@ -70,7 +70,7 @@ export function SidebarListHeader(props: { } > - + );