Merge f322360dca into release/next-js

bin/solid.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc1fb5cddfa4a1c67ade60d35fc985d55f4ca86ecbaa9b30901a7c257b7b06a4
-size 10035009
+oid sha256:7a91cd00f314071f246871fd91ed529b7bed77df0f5e3fa54d4a2348cccb80bf
+size 10099027

pkg/arvo/app/glob.hoon

@@ -5,7 +5,7 @@
 /-  glob
 /+  default-agent, verb, dbug
 |%
-++  hash  0v6.i86m5.f4rs9.l09fu.a7d86.v00sl
+++  hash  0v5.ancat.1qorl.7rea9.55ltu.2r24p
 +$  state-0  [%0 hash=@uv glob=(unit (each glob:glob tid=@ta))]
 +$  all-states
   $%  state-0

pkg/arvo/app/landscape/index.html

@@ -24,6 +24,6 @@
     <div id="portal-root"></div>
     <script src="/~landscape/js/channel.js"></script>
     <script src="/~landscape/js/session.js"></script>
-    <script src="/~landscape/js/bundle/index.438e593dfe16044b7120.js"></script>
+    <script src="/~landscape/js/bundle/index.38bd3865b4b9b1f3480b.js"></script>
   </body>
 </html>

pkg/arvo/lib/metadata-store.hoon

@@ -192,16 +192,19 @@
     ?:  ?=(%s -.jon)
       [%graph p.jon]
     ?>  ?=(%o -.jon)
+    =/  jin=json
+      (~(got by p.jon) %group)
+    ?>  ?=(%o -.jin)
     :+  %group  ~
-    ?.  ?&  (~(has by p.jon) 'app-name')
-            (~(has by p.jon) 'resource')
+    ?.  ?&  (~(has by p.jin) 'app-name')
+            (~(has by p.jin) 'resource')
         ==
       ~
-    =/  app-name=^json  (~(got by p.jon) 'app-name')
+    =/  app-name=^json  (~(got by p.jin) 'app-name')
     ?>  ?=(%s -.app-name)
     :+  ~
       p.app-name
-    =/  res=^json  (~(got by p.jon) 'resource')
+    =/  res=^json  (~(got by p.jin) 'resource')
     (dejs-path:resource res)
   ::
   ++  md-resource

pkg/interface/src/views/App.js

@@ -11,6 +11,9 @@ import 'mousetrap-global-bind';
 
 import './css/indigo-static.css';
 import './css/fonts.css';
+import './apps/chat/css/custom.css';
+import './landscape/css/custom.css';
+
 import light from '@tlon/indigo-light';
 import dark from '@tlon/indigo-dark';
 
@@ -194,4 +197,4 @@ export default withState(process.env.NODE_ENV === 'production' ? App : hot(App),
   [useContactState],
   [useSettingsState, ['display']],
   [useLocalState]
-]);
+]);

pkg/interface/src/views/apps/chat/components/chat-editor.js

@@ -108,6 +108,7 @@ export default class ChatEditor extends Component {
     if (prevProps.message !== props.message) {
       this.editor.setValue(props.message);
       this.editor.setOption('mode', MARKDOWN_CONFIG);
+      this.editor?.element?.focus();
       return;
     }
 

pkg/interface/src/views/apps/launch/app.js

@@ -234,7 +234,7 @@ export default function LaunchApp(props) {
         </Box>
         <Box alignSelf="flex-start" display={["block", "none"]}>{hashBox}</Box>
       </ScrollbarLessBox>
-      <Box onClick={() => history.push('/~graph/graph/ship/~bitpyx-dildus/infrastructure-digests/170141184504958869914231288036524556288/2/170141184504958917566472168072435204096') } display={["none", "block"]}>{hashBox}</Box>
+      <Box display={["none", "block"]}>{hashBox}</Box>
     </>
   );
 }

pkg/interface/src/views/apps/notifications/graph.tsx

@@ -75,6 +75,7 @@ const GraphUrl = ({ contents, api }) => {
         transcluded={1}
         link={referenceToPermalink(link).link}
         api={api}
+        showOurContact
       />);
   }
   return (
@@ -193,8 +194,7 @@ function getNodeUrl(
     }
     return graphUrl;
   } else if( mod === 'post') {
-    const [last, ...rest] = idx.reverse();
-    return `/~landscape${groupPath}/feed/${rest.join('/')}?post=${last}`;
+    return `/~landscape${groupPath}/feed${index}`;
   }
   return '';
 }

pkg/interface/src/views/apps/notifications/joining.tsx

@@ -44,7 +44,7 @@ export function JoiningStatus(props: JoiningStatusProps) {
       <Text display="block" flexShrink={0} color={isError ? 'red' : 'gray'}>
         {desc}
       </Text>
-      <StatelessAsyncAction onClick={onHide} flexShrink={1}>Hide</StatelessAsyncAction>
+      <StatelessAsyncAction backgroundColor="white" onClick={onHide} flexShrink={1}>Hide</StatelessAsyncAction>
     </Row>
   );
 }

pkg/interface/src/views/apps/permalinks/embed.tsx

@@ -63,7 +63,7 @@ function GraphPermalink(
   );
   useEffect(() => {
     (async () => {
-      if (pending) {
+      if (pending || !index) {
         return;
       }
       try {
@@ -87,7 +87,7 @@ function GraphPermalink(
       borderRadius="2"
       onClick={(e) => { e.stopPropagation(); }}
     >
-      {showTransclusion && (
+      {showTransclusion && index && (
         <Box p="2">
           <TranscludedNode
             api={api}

pkg/interface/src/views/components/GroupLink.tsx

@@ -64,7 +64,7 @@ export function GroupLink(
   }, [preview]);
 
   return (
-    <Box {...rest} onClick={(e) => { e.stopPropagation(); }}>
+    <Box maxWidth="500px" {...rest} onClick={(e) => { e.stopPropagation(); }}>
       {modal}
       <Row
         width="fit-content"

pkg/interface/src/views/landscape/components/Home/Post/PostInput.js

@@ -42,7 +42,7 @@ export function PostInput(props) {
       setDisabled(true);
       const url = await promptUpload();
       const { ship, name } = graphResource;
-      await api.graph.addPost(ship, name, createPost([{ url }]));
+      await api.graph.addPost(ship, name, createPost([{ url }], index || ''));
     } catch (e) {
       // TODO: better handling
       console.error(e);

pkg/interface/src/views/landscape/css/custom.css

@@ -7,6 +7,17 @@
 }
 
 a, a:any-link, a:-webkit-any-link {
-  text-decoration: none;
-  color: unset;
+  text-decoration: none !important;
+  color: none !important;
+}
+
+*|*:link {
+  text-decoration: none !important;
+  color: none !important;
+}
+
+a * {
+  text-decoration: none !important;
+  text-decoration-color: none;
+  text-decoration-line: none;
 }