mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-02 08:23:30 +00:00
Fixes onboarding modal (#318)
This commit is contained in:
parent
a5931e1f48
commit
1fa03e026a
|
@ -350,10 +350,10 @@ class Composer extends React.Component {
|
|||
acceptContentTypes={acceptContentTypes}
|
||||
advancedOptions={advancedOptions}
|
||||
disabled={isSubmitting}
|
||||
full={media.size >= 4 || media.some(
|
||||
full={media ? media.size >= 4 || media.some(
|
||||
item => item.get('type') === 'video'
|
||||
)}
|
||||
hasMedia={!!media.size}
|
||||
) : false}
|
||||
hasMedia={media && !!media.size}
|
||||
intl={intl}
|
||||
onChangeAdvancedOption={onChangeAdvancedOption}
|
||||
onChangeSensitivity={onChangeSensitivity}
|
||||
|
@ -369,7 +369,7 @@ class Composer extends React.Component {
|
|||
spoiler={spoiler}
|
||||
/>
|
||||
<ComposerPublisher
|
||||
countText={`${spoilerText}${countableText(text)}${advancedOptions.get('do_not_federate') ? ' 👁️' : ''}`}
|
||||
countText={`${spoilerText}${countableText(text)}${advancedOptions && advancedOptions.get('do_not_federate') ? ' 👁️' : ''}`}
|
||||
disabled={isSubmitting || isUploading || !!text.length && !text.trim().length}
|
||||
intl={intl}
|
||||
onSecondarySubmit={handleSecondarySubmit}
|
||||
|
|
|
@ -96,7 +96,7 @@ export default class ComposerOptionsDropdownContent extends React.PureComponent
|
|||
transform: `scale(${scaleX}, ${scaleY})`,
|
||||
}}
|
||||
>
|
||||
{items.map(
|
||||
{items ? items.map(
|
||||
({
|
||||
name,
|
||||
...rest
|
||||
|
@ -110,7 +110,7 @@ export default class ComposerOptionsDropdownContent extends React.PureComponent
|
|||
options={rest}
|
||||
/>
|
||||
)
|
||||
)}
|
||||
) : null}
|
||||
</div>
|
||||
)}
|
||||
</Motion>
|
||||
|
@ -127,7 +127,7 @@ ComposerOptionsDropdownContent.propTypes = {
|
|||
name: PropTypes.string.isRequired,
|
||||
on: PropTypes.bool,
|
||||
text: PropTypes.node,
|
||||
})).isRequired,
|
||||
})),
|
||||
onChange: PropTypes.func,
|
||||
onClose: PropTypes.func,
|
||||
style: PropTypes.object,
|
||||
|
|
|
@ -292,31 +292,29 @@ export default class ComposerOptions extends React.PureComponent {
|
|||
onClick={onToggleSpoiler}
|
||||
title={intl.formatMessage(messages.spoiler)}
|
||||
/>
|
||||
{advancedOptions ? (
|
||||
<Dropdown
|
||||
active={advancedOptions.some(value => !!value)}
|
||||
disabled={disabled}
|
||||
icon='ellipsis-h'
|
||||
items={[
|
||||
{
|
||||
meta: <FormattedMessage {...messages.local_only_long} />,
|
||||
name: 'do_not_federate',
|
||||
on: advancedOptions.get('do_not_federate'),
|
||||
text: <FormattedMessage {...messages.local_only_short} />,
|
||||
},
|
||||
{
|
||||
meta: <FormattedMessage {...messages.threaded_mode_long} />,
|
||||
name: 'threaded_mode',
|
||||
on: advancedOptions.get('threaded_mode'),
|
||||
text: <FormattedMessage {...messages.threaded_mode_short} />,
|
||||
},
|
||||
]}
|
||||
onChange={onChangeAdvancedOption}
|
||||
onModalClose={onModalClose}
|
||||
onModalOpen={onModalOpen}
|
||||
title={intl.formatMessage(messages.advanced_options_icon_title)}
|
||||
/>
|
||||
) : null}
|
||||
<Dropdown
|
||||
active={advancedOptions && advancedOptions.some(value => !!value)}
|
||||
disabled={disabled}
|
||||
icon='ellipsis-h'
|
||||
items={advancedOptions ? [
|
||||
{
|
||||
meta: <FormattedMessage {...messages.local_only_long} />,
|
||||
name: 'do_not_federate',
|
||||
on: advancedOptions.get('do_not_federate'),
|
||||
text: <FormattedMessage {...messages.local_only_short} />,
|
||||
},
|
||||
{
|
||||
meta: <FormattedMessage {...messages.threaded_mode_long} />,
|
||||
name: 'threaded_mode',
|
||||
on: advancedOptions.get('threaded_mode'),
|
||||
text: <FormattedMessage {...messages.threaded_mode_short} />,
|
||||
},
|
||||
] : null}
|
||||
onChange={onChangeAdvancedOption}
|
||||
onModalClose={onModalClose}
|
||||
onModalOpen={onModalOpen}
|
||||
title={intl.formatMessage(messages.advanced_options_icon_title)}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -38,11 +38,6 @@ PageOne.propTypes = {
|
|||
domain: PropTypes.string.isRequired,
|
||||
};
|
||||
|
||||
const composerState = {
|
||||
showSearch: true,
|
||||
text: 'Awoo! #introductions',
|
||||
};
|
||||
|
||||
const PageTwo = ({ intl, myAccount }) => (
|
||||
<div className='onboarding-modal__page onboarding-modal__page-two'>
|
||||
<div className='figure non-interactive'>
|
||||
|
@ -50,7 +45,9 @@ const PageTwo = ({ intl, myAccount }) => (
|
|||
<DrawerAccount account={myAccount} />
|
||||
<RawComposer
|
||||
intl={intl}
|
||||
state={composerState}
|
||||
privacy='public'
|
||||
showSearch
|
||||
text='Awoo! #introductions'
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue