urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-28 05:22:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/next-userspace' into mp/landscape/flex-collections

Browse Source
This commit is contained in:
Matilde Park 2021-07-07 19:31:31 -04:00
commit 6fd814d6b5
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/interface/src/views/App.js
View File

@ -208,7 +208,7 @@ class App extends React.Component {
const WarmApp = process.env.NODE_ENV === 'production' ? App : hot(App); const WarmApp = process.env.NODE_ENV === 'production' ? App : hot(App);
const selContacts = s => s.contacts[`~${window.ship}`]; const selContacts = s => s.contacts[`~${window.ship}`];
const selLocal = s => [s.set, s.omniboxShown, s.toggleOmnibox]; const selLocal = s => [s.set, s.omniboxShown, s.toggleOmnibox, s.dark];
const selSettings = s => [s.display, s.getAll]; const selSettings = s => [s.display, s.getAll];
const selGraph = s => s.getShallowChildren; const selGraph = s => s.getShallowChildren;
const selLaunch = s => [s.getRuntimeLag, s.getBaseHash]; const selLaunch = s => [s.getRuntimeLag, s.getBaseHash];
@ -216,7 +216,7 @@ const selLaunch = s => [s.getRuntimeLag, s.getBaseHash];
const WithApp = React.forwardRef((props, ref) => { const WithApp = React.forwardRef((props, ref) => {
const ourContact = useContactState(selContacts); const ourContact = useContactState(selContacts);
const [display, getAll] = useSettingsState(selSettings, shallow); const [display, getAll] = useSettingsState(selSettings, shallow);
const [setLocal, omniboxShown, toggleOmnibox] = useLocalState(selLocal); const [setLocal, omniboxShown, toggleOmnibox, dark] = useLocalState(selLocal);
const getShallowChildren = useGraphState(selGraph); const getShallowChildren = useGraphState(selGraph);
const [getRuntimeLag, getBaseHash] = useLaunchState(selLaunch, shallow); const [getRuntimeLag, getBaseHash] = useLaunchState(selLaunch, shallow);
@ -227,6 +227,7 @@ const WithApp = React.forwardRef((props, ref) => {
display={display} display={display}
getAll={getAll} getAll={getAll}
set={setLocal} set={setLocal}
dark={dark}
getShallowChildren={getShallowChildren} getShallowChildren={getShallowChildren}
getRuntimeLag={getRuntimeLag} getRuntimeLag={getRuntimeLag}
getBaseHash={getBaseHash} getBaseHash={getBaseHash}

4
pkg/interface/src/views/apps/term/app.tsx
View File

@ -11,12 +11,10 @@ import './css/custom.css';
import Store from './store'; import Store from './store';
import Subscription from './subscription'; import Subscription from './subscription';
class TermApp extends Component { class TermApp extends Component<any, any> {
store: Store; store: Store;
api: any; api: any;
subscription: any; subscription: any;
declare props: any;
declare state: any;
constructor(props) { constructor(props) {
super(props); super(props);
this.store = new Store(); this.store = new Store();

3
pkg/interface/src/views/apps/term/components/input.tsx
View File

@ -1,9 +1,8 @@
import { BaseInput, Box, Row } from '@tlon/indigo-react'; import { BaseInput, Box, Row } from '@tlon/indigo-react';
import React, { Component } from 'react'; import React, { Component } from 'react';
export class Input extends Component { export class Input extends Component<any, {}> {
inputRef: React.RefObject<unknown>; inputRef: React.RefObject<unknown>;
declare props: any;
constructor(props) { constructor(props) {
super(props); super(props);
this.state = {}; this.state = {};

2
pkg/interface/src/views/components/ImageInput.tsx
View File

@ -98,7 +98,7 @@ const errorRetry = (meta, focus, uploading, clickUploadButton) => {
style={{ pointerEvents: 'none' }} style={{ pointerEvents: 'none' }}
onSelect={e => e.preventDefault} onSelect={e => e.preventDefault}
> >
{meta.error()} {meta.error}
{', '}please{' '} {', '}please{' '}
<Text <Text
fontWeight='500' fontWeight='500'