Skip to content

Commit 23539d5

Browse files
committed
Starting point for sift integration
1 parent eddf688 commit 23539d5

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

packages/sift/src/js/components/Column.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import h from "@macrostrat/hyper";
22
import React from "react";
3-
import { Link, useParams } from "react-router-dom";
3+
import { useParams } from "react-router-dom";
4+
import { Link as VikeLink } from "~/renderer/Link";
45
import Chart from "./Chart";
56
import Footer from "./Footer";
67
import { SiftLink } from "./Link";
@@ -284,13 +285,13 @@ class _Column extends React.Component {
284285
<PrevalentTaxa data={this.state.prevalentTaxa} />
285286

286287
<StratColumn data={this.state.units} />
287-
<Link
288-
to={"/column/" + this.state.properties.col_id}
288+
<VikeLink
289+
href={"/columns/" + this.state.properties.col_id}
289290
target="_blank"
290291
className="normalize-link alternate-column"
291292
>
292293
Alternate column view
293-
</Link>
294+
</VikeLink>
294295
</div>
295296

296297
<Footer data={this.state.refs} />

packages/sift/src/js/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,7 @@ class App extends React.Component {
124124
this.getNavigateURL = this.getNavigateURL.bind(this);
125125
}
126126
getNavigateURL(item) {
127-
let prefix =
128-
siftPrefix + "/" + this.props.categoryRouteLookup[item.dataset] + "/";
127+
let prefix = "/" + this.props.categoryRouteLookup[item.dataset] + "/";
129128
if (item.id != 0) {
130129
return prefix + item.id;
131130
} else {
@@ -226,6 +225,7 @@ function TopBarAutocomplete(props) {
226225
const finish = React.useCallback(
227226
(item) => {
228227
let url = props.getNavigateURL(item);
228+
console.log(url);
229229
navigate(url);
230230
},
231231
[navigate]

src/renderer/Link.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ export function Link(props: {
55
href?: string;
66
className?: string;
77
children: React.ReactNode;
8+
target?: string;
89
}) {
910
const pageContext = usePageContext();
1011
const className = [

0 commit comments

Comments
 (0)