Skip to content

Commit 27329c2

Browse files
committed
Merge branch 'master' into release
2 parents 68f8083 + 4e8eca3 commit 27329c2

File tree

88 files changed

+5530
-2409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+5530
-2409
lines changed

demo/src/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ module.exports = {
5555
get ImageScreen() {
5656
return require('./screens/componentScreens/ImageScreen').default;
5757
},
58+
get ProgressiveImageScreen() {
59+
return require('./screens/componentScreens/ProgressiveImageScreen').default;
60+
},
5861
get MaskedInputScreen() {
5962
return require('./screens/componentScreens/MaskedInputScreen').default;
6063
},

demo/src/screens/ExampleScreenPresenter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export function renderBooleanGroup(title, options) {
5959
);
6060
}
6161

62-
export function renderRadioGroup(title, key, options, {isRow} = {}) {
62+
export function renderRadioGroup(title, key, options, {isRow, afterValueChanged} = {}) {
6363
const value = this.state[key];
6464
return (
6565
<View marginB-s2>
@@ -70,7 +70,7 @@ export function renderRadioGroup(title, key, options, {isRow} = {}) {
7070
row={isRow}
7171
style={isRow && styles.rowWrap}
7272
initialValue={value}
73-
onValueChange={value => this.setState({[key]: value})}
73+
onValueChange={value => this.setState({[key]: value}, afterValueChanged)}
7474
>
7575
{_.map(options, (value, key) => {
7676
return (

demo/src/screens/MainScreen.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class MainScreen extends Component {
5050

5151
onSearchBoxBlur = () => {
5252
this.closeSearchBox();
53-
this.filterExplorerScreens('');
53+
// this.filterExplorerScreens('');
5454
};
5555

5656
getMenuData = () => {
@@ -97,7 +97,7 @@ class MainScreen extends Component {
9797
this.closeSearchBox();
9898

9999
setTimeout(() => {
100-
this.filterExplorerScreens('');
100+
// this.filterExplorerScreens('');
101101
this.pushScreen(row);
102102
}, 0);
103103
};

demo/src/screens/MenuStructure.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ export const navigationData = {
119119
title: 'Animations & Gestures',
120120
screens: [
121121
{title: 'Animated Image', tags: 'animated image', screen: 'unicorn.components.AnimatedImageScreen'},
122+
{title: 'ProgressiveImage', tags: 'progressive image cover overlay', screen: 'unicorn.components.ProgressiveImageScreen'},
122123
{title: 'List Animations', tags: 'animated card', screen: 'unicorn.animations.ListAnimationsScreen'},
123124
{title: 'Card Animations', tags: 'animated card', screen: 'unicorn.animations.CardAnimationsScreen'},
124125
{title: 'Card Scanner', tags: 'card scanner process', screen: 'unicorn.animations.CardScannerScreen'},

demo/src/screens/PlaygroundScreen.js renamed to demo/src/screens/PlaygroundScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import _ from 'lodash';
22
import React, {Component} from 'react';
33
import {StyleSheet} from 'react-native';
4-
import {View, Text, Card} from 'react-native-ui-lib'; //eslint-disable-line
4+
import {View, Text, Card,} from 'react-native-ui-lib'; //eslint-disable-line
55

66
export default class PlaygroundScreen extends Component {
77
render() {

0 commit comments

Comments
 (0)