Skip to content

feat: react-native expression-ui package, update example #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"migIndex": 1,
"data": [
{
"path": "assets/counter.riv",
"sha1": "d846439f9b15d0a995e04f743e96c3e11345bf1a"
"path": "assets/expressionui.riv",
"sha1": "dbb99a4f792c3518e6d2bf4f9dd7d0f61ab27859"
}
]
}
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
7699B88040F8A987B510C191 /* libPods-ExampleReactNative-ExampleReactNativeTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-ExampleReactNative-ExampleReactNativeTests.a */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
89BA4A696B2743C09D86F34E /* counter.riv in Resources */ = {isa = PBXBuildFile; fileRef = A308EA2B6BC7477E81DF25C0 /* counter.riv */; };
7D3D7B5BBB3D4FC3BB50EBEE /* expressionui.riv in Resources */ = {isa = PBXBuildFile; fileRef = 50F771C16362441F8570CA26 /* expressionui.riv */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -44,8 +44,8 @@
5DCACB8F33CDC322A6C60F78 /* libPods-ExampleReactNative.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ExampleReactNative.a"; sourceTree = BUILT_PRODUCTS_DIR; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = ExampleReactNative/LaunchScreen.storyboard; sourceTree = "<group>"; };
89C6BE57DB24E9ADA2F236DE /* Pods-ExampleReactNative-ExampleReactNativeTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleReactNative-ExampleReactNativeTests.release.xcconfig"; path = "Target Support Files/Pods-ExampleReactNative-ExampleReactNativeTests/Pods-ExampleReactNative-ExampleReactNativeTests.release.xcconfig"; sourceTree = "<group>"; };
A308EA2B6BC7477E81DF25C0 /* counter.riv */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = counter.riv; path = ../assets/counter.riv; sourceTree = "<group>"; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
50F771C16362441F8570CA26 /* expressionui.riv */ = {isa = PBXFileReference; name = "expressionui.riv"; path = "../assets/expressionui.riv"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -154,7 +154,7 @@
E8878CE30645494A985B7B44 /* Resources */ = {
isa = PBXGroup;
children = (
A308EA2B6BC7477E81DF25C0 /* counter.riv */,
50F771C16362441F8570CA26 /* expressionui.riv */,
);
name = Resources;
path = "";
Expand Down Expand Up @@ -255,7 +255,7 @@
files = (
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
89BA4A696B2743C09D86F34E /* counter.riv in Resources */,
7D3D7B5BBB3D4FC3BB50EBEE /* expressionui.riv in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
4 changes: 2 additions & 2 deletions examples/example-react-native/ios/link-assets-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"migIndex": 1,
"data": [
{
"path": "assets/counter.riv",
"sha1": "d846439f9b15d0a995e04f743e96c3e11345bf1a"
"path": "assets/expressionui.riv",
"sha1": "dbb99a4f792c3518e6d2bf4f9dd7d0f61ab27859"
}
]
}
30 changes: 23 additions & 7 deletions examples/example-react-native/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import React from 'react';
import Intro from './Intro';
import {NavigationContainer} from '@react-navigation/native';
import {createNativeStackNavigator} from '@react-navigation/native-stack';
import Counter from './Counter';

import StartupScreen from './screens/StartupScreen';
import CrossFrameworkScreen from './screens/CrossFrameworkScreen';
import DeveloperFriendlyScreen from './screens/DeveloperFriendlyScreen';
import PixelPerfectionScreen from './screens/PixelPerfectionScreen';
import ComposableScreen from './screens/ComposableScreen';

import type {NativeStackNavigationOptions} from '@react-navigation/native-stack';

Expand All @@ -11,18 +15,30 @@ const options: NativeStackNavigationOptions = {
};

export type StackParamList = {
Intro: undefined;
Counter: undefined;
Startup: undefined;
CrossFramework: undefined;
DeveloperFriendly: undefined;
PixelPerfection: undefined;
Composable: undefined;
};

const Stack = createNativeStackNavigator<StackParamList>();

export default function App() {
return (
<NavigationContainer>
<Stack.Navigator initialRouteName="Intro" screenOptions={options}>
<Stack.Screen name="Intro" component={Intro} />
<Stack.Screen name="Counter" component={Counter} />
<Stack.Navigator initialRouteName="Startup" screenOptions={options}>
<Stack.Screen name="Startup" component={StartupScreen} />
<Stack.Screen name="CrossFramework" component={CrossFrameworkScreen} />
<Stack.Screen
name="DeveloperFriendly"
component={DeveloperFriendlyScreen}
/>
<Stack.Screen
name="PixelPerfection"
component={PixelPerfectionScreen}
/>
<Stack.Screen name="Composable" component={ComposableScreen} />
</Stack.Navigator>
</NavigationContainer>
);
Expand Down
23 changes: 0 additions & 23 deletions examples/example-react-native/src/Counter/index.tsx

This file was deleted.

18 changes: 0 additions & 18 deletions examples/example-react-native/src/Intro/index.tsx

This file was deleted.

39 changes: 39 additions & 0 deletions examples/example-react-native/src/components/ExpressionView.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import React from 'react';
import {Fit} from 'rive-react-native';
import {ViewStyle} from 'react-native';

import StateEvent from '../expression-ui/state-event';
import BaseExpressionView from '../expression-ui/BaseExpressionView';
import {EXPRESSION_UI_RIVE_RESOURCE} from '../constants/expression_constants';

interface ExpressionViewProps {
artboardName: string;
onEvent?: (event: StateEvent) => void;
scrollable?: boolean;
stateMachineName?: string;
fit?: Fit;
style?: ViewStyle;
}

const ExpressionView: React.FC<ExpressionViewProps> = ({
artboardName,
onEvent,
scrollable,
stateMachineName,
fit,
style,
}) => {
return (
<BaseExpressionView
resourceName={EXPRESSION_UI_RIVE_RESOURCE}
artboardName={artboardName}
onEvent={onEvent}
scrollable={scrollable}
stateMachineName={stateMachineName}
fit={fit}
style={style}
/>
);
};

export default ExpressionView;
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export const EXPRESSION_UI_RIVE_RESOURCE = 'expressionui';

export const INTRO_VIEW = 'intro-view';
export const CROSS_FRAMEWORK_VIEW = 'cross-framework-view';
export const DEVELOPER_FRIENDLY_VIEW = 'developer-friendly-view';
export const PIXEL_PERFECTION_VIEW = 'pixel-perfection-view';
export const COMPOSABLE_VIEW = 'composable-view';
export const THEME_VIEW = 'theme-view';
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import React from 'react';
import Rive, {Alignment, Fit, RiveRef} from 'rive-react-native';
import {ScrollView, StyleSheet, ViewStyle} from 'react-native';

import StateEvent from './state-event';

interface BaseExpressionViewProps {
resourceName: string;
artboardName: string;
onEvent?: (event: StateEvent, riveRef: RiveRef | null) => void;
scrollable?: boolean;
textValues?: Record<string, string>;
stateMachineName?: string;
fit?: Fit;
style?: ViewStyle;
}

const BaseExpressionView: React.FC<BaseExpressionViewProps> = ({
resourceName,
artboardName,
onEvent,
scrollable = false,
textValues = {},
stateMachineName,
fit = Fit.Cover,
style,
}) => {
const riveRef = React.useRef<RiveRef>(null);

React.useEffect(() => {
if (riveRef.current) {
for (const [key, value] of Object.entries(textValues)) {
riveRef.current.setTextRunValue(key, value);
}
}
}, [riveRef, textValues]);

const riveView = (
<Rive
ref={riveRef}
resourceName={resourceName}
artboardName={artboardName}
fit={fit}
alignment={scrollable ? Alignment.TopCenter : Alignment.Center}
stateMachineName={stateMachineName}
onRiveEventReceived={event =>
onEvent?.(new StateEvent(event.name), riveRef.current)
}
style={Object.assign(style ?? {}, scrollable ? styles.animation : {})}
/>
);

return scrollable ? (
<ScrollView contentContainerStyle={styles.container}>{riveView}</ScrollView>
) : (
riveView
);
};

const styles = StyleSheet.create({
container: {
flexGrow: 1,
alignItems: 'center',
justifyContent: 'center',
},
animation: {
width: '100%',
},
});

export default BaseExpressionView;
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export default class StateEvent {
constructor(public readonly name: string) {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react';

import {COMPOSABLE_VIEW} from '../../constants/expression_constants';
import ExpressionView from '../../components/ExpressionView';

export default function ComposableScreen(): React.JSX.Element {
return <ExpressionView artboardName={COMPOSABLE_VIEW} />;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react';
import {NativeStackScreenProps} from '@react-navigation/native-stack';

import {StackParamList} from '../../App';
import {CROSS_FRAMEWORK_VIEW} from '../../constants/expression_constants';
import ExpressionView from '../../components/ExpressionView';

type Props = NativeStackScreenProps<StackParamList, 'CrossFramework'>;

export default function CrossFrameworkScreen({
navigation,
}: Props): React.JSX.Element {
return (
<ExpressionView
artboardName={CROSS_FRAMEWORK_VIEW}
onEvent={_ => navigation.push('DeveloperFriendly')}
/>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react';
import {NativeStackScreenProps} from '@react-navigation/native-stack';

import {StackParamList} from '../../App';
import {DEVELOPER_FRIENDLY_VIEW} from '../../constants/expression_constants';
import ExpressionView from '../../components/ExpressionView';

type Props = NativeStackScreenProps<StackParamList, 'DeveloperFriendly'>;

export default function DeveloperFriendlyScreen({
navigation,
}: Props): React.JSX.Element {
return (
<ExpressionView
artboardName={DEVELOPER_FRIENDLY_VIEW}
onEvent={_ => navigation.push('PixelPerfection')}
/>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import React from 'react';
import {NativeStackScreenProps} from '@react-navigation/native-stack';

import {StackParamList} from '../../App';
import {PIXEL_PERFECTION_VIEW} from '../../constants/expression_constants';
import ExpressionView from '../../components/ExpressionView';

type Props = NativeStackScreenProps<StackParamList, 'PixelPerfection'>;

export default function PixelPerfectionScreen({
navigation,
}: Props): React.JSX.Element {
return (
<ExpressionView
artboardName={PIXEL_PERFECTION_VIEW}
onEvent={_ => navigation.push('Composable')}
/>
);
}
21 changes: 21 additions & 0 deletions examples/example-react-native/src/screens/StartupScreen/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import React from 'react';
import {NativeStackScreenProps} from '@react-navigation/native-stack';

import {StackParamList} from '../../App';
import {
EXPRESSION_UI_RIVE_RESOURCE,
INTRO_VIEW,
} from '../../constants/expression_constants';
import BaseExpressionView from '../../expression-ui/BaseExpressionView';

type Props = NativeStackScreenProps<StackParamList, 'Startup'>;

export default function StartupScreen({navigation}: Props): React.JSX.Element {
return (
<BaseExpressionView
resourceName={EXPRESSION_UI_RIVE_RESOURCE}
artboardName={INTRO_VIEW}
onEvent={_ => navigation.replace('CrossFramework')}
/>
);
}