Skip to content

Commit

Permalink
Merge pull request #256 from wey-gu/wey/react-three/drei
Browse files Browse the repository at this point in the history
bump glodrei to its successor react-three/drei
  • Loading branch information
amcdnl authored Jul 25, 2024
2 parents af4837f + 622ef27 commit b73671d
Show file tree
Hide file tree
Showing 10 changed files with 211 additions and 116 deletions.
2 changes: 1 addition & 1 deletion .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Stats } from 'glodrei';
import { Stats } from '@react-three/drei';
import theme from './theme';
import { Preview } from '@storybook/react';

Expand Down
305 changes: 198 additions & 107 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"homepage": "https://github.com/reaviz/reagraph#readme",
"dependencies": {
"@react-spring/three": "9.6.1",
"@react-three/drei": "^9.109.2",
"@react-three/fiber": "8.13.5",
"camera-controls": "^2.8.3",
"classnames": "^2.5.1",
Expand All @@ -60,7 +61,6 @@
"d3-hierarchy": "^3.1.2",
"d3-scale": "^4.0.2",
"ellipsize": "^0.5.1",
"glodrei": "^0.0.1",
"graphology": "^0.25.4",
"graphology-layout": "^0.6.1",
"graphology-layout-forceatlas2": "^0.10.1",
Expand Down
2 changes: 1 addition & 1 deletion src/symbols/Cluster.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useSpring, a } from '@react-spring/three';
import { Color, DoubleSide } from 'three';
import { useStore } from '../store';
import { Label } from './Label';
import { useCursor } from 'glodrei';
import { useCursor } from '@react-three/drei';
import { ThreeEvent } from '@react-three/fiber';

export type ClusterEventArgs = Omit<ClusterGroup, 'position'>;
Expand Down
2 changes: 1 addition & 1 deletion src/symbols/Edge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
import { Line } from './Line';
import { useStore } from '../store';
import { ContextMenuEvent, InternalGraphEdge } from '../types';
import { Html, useCursor } from 'glodrei';
import { Html, useCursor } from '@react-three/drei';
import { useHoverIntent } from '../utils/useHoverIntent';
import { Euler, Vector3 } from 'three';
import { ThreeEvent } from '@react-three/fiber';
Expand Down
2 changes: 1 addition & 1 deletion src/symbols/Label.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { FC, useMemo } from 'react';
import { Billboard, Text } from 'glodrei';
import { Billboard, Text } from '@react-three/drei';
import { Color, ColorRepresentation, Euler } from 'three';
import ellipsize from 'ellipsize';

Expand Down
2 changes: 1 addition & 1 deletion src/symbols/Node.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
NodeRenderer,
CollapseProps
} from '../types';
import { Html, useCursor } from 'glodrei';
import { Html, useCursor } from '@react-three/drei';
import { useCameraControls } from '../CameraControls';
import { useStore } from '../store';
import { useDrag } from '../utils/useDrag';
Expand Down
2 changes: 1 addition & 1 deletion src/symbols/Ring.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { FC, useMemo } from 'react';
import { Color, ColorRepresentation, DoubleSide } from 'three';
import { animationConfig } from '../utils/animation';
import { useSpring, a } from '@react-spring/three';
import { Billboard } from 'glodrei';
import { Billboard } from '@react-three/drei';

export interface RingProps {
/**
Expand Down
2 changes: 1 addition & 1 deletion src/symbols/edges/Edge.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { FC, useCallback, useMemo } from 'react';
import { useSpring, a } from '@react-spring/three';
import { Html } from 'glodrei';
import { Html } from '@react-three/drei';
import { ColorRepresentation, Euler } from 'three';

import { useStore } from '../../store';
Expand Down
6 changes: 5 additions & 1 deletion src/symbols/nodes/Svg.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ import React, { FC, useMemo } from 'react';
import { a, useSpring } from '@react-spring/three';
import { animationConfig } from '../../utils';
import { NodeRendererProps } from '../../types';
import { Billboard, Svg as DreiSvg, SvgProps as DreiSvgProps } from 'glodrei';
import {
Billboard,
Svg as DreiSvg,
SvgProps as DreiSvgProps
} from '@react-three/drei';
import { Color, DoubleSide } from 'three';

export type SvgProps = NodeRendererProps &
Expand Down

0 comments on commit b73671d

Please sign in to comment.