Skip to content

Commit

Permalink
Merge pull request #7176 from Expensify/roryabraham-cherry-pick-stagi…
Browse files Browse the repository at this point in the history
…ng-7149
  • Loading branch information
OSBotify authored Jan 12, 2022
2 parents 14c6889 + 5d66867 commit 299be88
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 6 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001012901
versionName "1.1.29-1"
versionCode 1001012902
versionName "1.1.29-2"
}
splits {
abi {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.1.29.1</string>
<string>1.1.29.2</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.1.29.1</string>
<string>1.1.29.2</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.1.29-1",
"version": "1.1.29-2",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
Expand Down
1 change: 1 addition & 0 deletions src/components/TextInput/baseTextInputPropTypes.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const propTypes = {
/** input style */
inputStyle: PropTypes.arrayOf(PropTypes.object),

/** If present, this prop forces the label to remain in a position where it will not collide with input text */
forceActiveLabel: PropTypes.bool,

/** Should the input auto focus? */
Expand Down
68 changes: 68 additions & 0 deletions src/stories/TextInput.stories.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import React from 'react';
import TextInput from '../components/TextInput';

/**
* We use the Component Story Format for writing stories. Follow the docs here:
*
* https://storybook.js.org/docs/react/writing-stories/introduction#component-story-format
*/
const story = {
title: 'Components/TextInput',
component: TextInput,
};

// eslint-disable-next-line react/jsx-props-no-spreading
const Template = args => <TextInput {...args} />;

// Arguments can be passed to the component by binding
// See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args

const AutoFocus = Template.bind({});
AutoFocus.args = {
label: 'Auto-focused text input',
name: 'AutoFocus',
autoFocus: true,
};

const Default = Template.bind({});
Default.args = {
label: 'Default text input',
name: 'Default',
};

const DefaultValue = Template.bind({});
DefaultValue.args = {
label: 'Input with default value',
name: 'DefaultValue',
defaultValue: 'My default value',
};

const ErrorStory = Template.bind({});
ErrorStory.args = {
label: 'Input with error',
name: 'InputWithError',
errorText: 'This field has an error.',
};

const ForceActiveLabel = Template.bind({});
ForceActiveLabel.args = {
label: 'Forced active label',
forceActiveLabel: true,
};

const Placeholder = Template.bind({});
Placeholder.args = {
label: 'Input with placeholder',
name: 'Placeholder',
placeholder: 'My placeholder text',
};

export default story;
export {
AutoFocus,
Default,
DefaultValue,
ErrorStory,
ForceActiveLabel,
Placeholder,
};

0 comments on commit 299be88

Please sign in to comment.