Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
Open sidebar
Tiger Ton
mastodon
Commits
83b21e90
Commit
83b21e90
authored
3 years ago
by
Yamagishi Kazutoshi
Committed by
GitHub
2 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Bump React from 16.14.0 to 18.1.0
parent
f804c009
Changes
226
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
app/javascript/mastodon/features/account_timeline/index.js
+0
-1
app/javascript/mastodon/features/account_timeline/index.js
app/javascript/mastodon/features/audio/index.js
+2
-2
app/javascript/mastodon/features/audio/index.js
app/javascript/mastodon/features/blocks/index.js
+1
-2
app/javascript/mastodon/features/blocks/index.js
app/javascript/mastodon/features/bookmarked_statuses/index.js
+1
-2
...javascript/mastodon/features/bookmarked_statuses/index.js
app/javascript/mastodon/features/community_timeline/components/column_settings.js
+2
-2
...features/community_timeline/components/column_settings.js
app/javascript/mastodon/features/community_timeline/index.js
+2
-2
app/javascript/mastodon/features/community_timeline/index.js
app/javascript/mastodon/features/compose/components/action_bar.js
+2
-2
...script/mastodon/features/compose/components/action_bar.js
app/javascript/mastodon/features/compose/components/autosuggest_account.js
+0
-1
...stodon/features/compose/components/autosuggest_account.js
app/javascript/mastodon/features/compose/components/character_counter.js
+2
-2
...mastodon/features/compose/components/character_counter.js
app/javascript/mastodon/features/compose/components/compose_form.js
+0
-1
...ript/mastodon/features/compose/components/compose_form.js
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+6
-6
...odon/features/compose/components/emoji_picker_dropdown.js
app/javascript/mastodon/features/compose/components/language_dropdown.js
+3
-3
...mastodon/features/compose/components/language_dropdown.js
app/javascript/mastodon/features/compose/components/navigation_bar.js
+0
-1
...pt/mastodon/features/compose/components/navigation_bar.js
app/javascript/mastodon/features/compose/components/poll_button.js
+2
-2
...cript/mastodon/features/compose/components/poll_button.js
app/javascript/mastodon/features/compose/components/poll_form.js
+2
-2
...ascript/mastodon/features/compose/components/poll_form.js
app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+4
-4
.../mastodon/features/compose/components/privacy_dropdown.js
app/javascript/mastodon/features/compose/components/reply_indicator.js
+0
-1
...t/mastodon/features/compose/components/reply_indicator.js
app/javascript/mastodon/features/compose/components/search.js
+3
-3
...javascript/mastodon/features/compose/components/search.js
app/javascript/mastodon/features/compose/components/search_results.js
+0
-1
...pt/mastodon/features/compose/components/search_results.js
app/javascript/mastodon/features/compose/components/text_icon_button.js
+2
-2
.../mastodon/features/compose/components/text_icon_button.js
with
34 additions
and
42 deletions
+34
-42
app/javascript/mastodon/features/account_timeline/index.js
+
0
-
1
View file @
83b21e90
import
React
from
'
react
'
;
import
{
connect
}
from
'
react-redux
'
;
import
ImmutablePropTypes
from
'
react-immutable-proptypes
'
;
import
PropTypes
from
'
prop-types
'
;
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/audio/index.js
+
2
-
2
View file @
83b21e90
import
React
from
'
react
'
;
import
{
PureComponent
}
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
import
{
defineMessages
,
injectIntl
}
from
'
react-intl
'
;
import
{
formatTime
}
from
'
mastodon/features/video
'
;
...
...
@@ -21,7 +21,7 @@ const TICK_SIZE = 10;
const
PADDING
=
180
;
export
default
@
injectIntl
class
Audio
extends
React
.
PureComponent
{
class
Audio
extends
PureComponent
{
static
propTypes
=
{
src
:
PropTypes
.
string
.
isRequired
,
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/blocks/index.js
+
1
-
2
View file @
83b21e90
import
React
from
'
react
'
;
import
{
connect
}
from
'
react-redux
'
;
import
{
defineMessages
,
injectIntl
,
FormattedMessage
}
from
'
react-intl
'
;
import
ImmutablePureComponent
from
'
react-immutable-pure-component
'
;
...
...
@@ -36,7 +35,7 @@ class Blocks extends ImmutablePureComponent {
multiColumn
:
PropTypes
.
bool
,
};
componentWillMount
()
{
UNSAFE_
componentWillMount
()
{
this
.
props
.
dispatch
(
fetchBlocks
());
}
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/bookmarked_statuses/index.js
+
1
-
2
View file @
83b21e90
import
React
from
'
react
'
;
import
{
connect
}
from
'
react-redux
'
;
import
PropTypes
from
'
prop-types
'
;
import
ImmutablePropTypes
from
'
react-immutable-proptypes
'
;
...
...
@@ -35,7 +34,7 @@ class Bookmarks extends ImmutablePureComponent {
isLoading
:
PropTypes
.
bool
,
};
componentWillMount
()
{
UNSAFE_
componentWillMount
()
{
this
.
props
.
dispatch
(
fetchBookmarkedStatuses
());
}
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/community_timeline/components/column_settings.js
+
2
-
2
View file @
83b21e90
import
React
from
'
react
'
;
import
{
PureComponent
}
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
import
ImmutablePropTypes
from
'
react-immutable-proptypes
'
;
import
{
injectIntl
,
FormattedMessage
}
from
'
react-intl
'
;
import
SettingToggle
from
'
../../notifications/components/setting_toggle
'
;
export
default
@
injectIntl
class
ColumnSettings
extends
React
.
PureComponent
{
class
ColumnSettings
extends
PureComponent
{
static
propTypes
=
{
settings
:
ImmutablePropTypes
.
map
.
isRequired
,
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/community_timeline/index.js
+
2
-
2
View file @
83b21e90
import
React
from
'
react
'
;
import
{
PureComponent
}
from
'
react
'
;
import
{
connect
}
from
'
react-redux
'
;
import
{
defineMessages
,
injectIntl
,
FormattedMessage
}
from
'
react-intl
'
;
import
PropTypes
from
'
prop-types
'
;
...
...
@@ -29,7 +29,7 @@ const mapStateToProps = (state, { columnId }) => {
export
default
@
connect
(
mapStateToProps
)
@
injectIntl
class
CommunityTimeline
extends
React
.
PureComponent
{
class
CommunityTimeline
extends
PureComponent
{
static
contextTypes
=
{
router
:
PropTypes
.
object
,
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/action_bar.js
+
2
-
2
View file @
83b21e90
import
React
from
'
react
'
;
import
{
PureComponent
}
from
'
react
'
;
import
ImmutablePropTypes
from
'
react-immutable-proptypes
'
;
import
PropTypes
from
'
prop-types
'
;
import
DropdownMenuContainer
from
'
../../../containers/dropdown_menu_container
'
;
...
...
@@ -20,7 +20,7 @@ const messages = defineMessages({
});
export
default
@
injectIntl
class
ActionBar
extends
React
.
PureComponent
{
class
ActionBar
extends
PureComponent
{
static
propTypes
=
{
account
:
ImmutablePropTypes
.
map
.
isRequired
,
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/autosuggest_account.js
+
0
-
1
View file @
83b21e90
import
React
from
'
react
'
;
import
Avatar
from
'
../../../components/avatar
'
;
import
DisplayName
from
'
../../../components/display_name
'
;
import
ImmutablePropTypes
from
'
react-immutable-proptypes
'
;
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/character_counter.js
+
2
-
2
View file @
83b21e90
import
React
from
'
react
'
;
import
{
PureComponent
}
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
import
{
length
}
from
'
stringz
'
;
export
default
class
CharacterCounter
extends
React
.
PureComponent
{
export
default
class
CharacterCounter
extends
PureComponent
{
static
propTypes
=
{
text
:
PropTypes
.
string
.
isRequired
,
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/compose_form.js
+
0
-
1
View file @
83b21e90
import
React
from
'
react
'
;
import
CharacterCounter
from
'
./character_counter
'
;
import
Button
from
'
../../../components/button
'
;
import
ImmutablePropTypes
from
'
react-immutable-proptypes
'
;
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+
6
-
6
View file @
83b21e90
import
React
from
'
react
'
;
import
{
PureComponent
}
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
import
{
defineMessages
,
injectIntl
,
FormattedMessage
}
from
'
react-intl
'
;
import
{
EmojiPicker
as
EmojiPickerAsync
}
from
'
../../ui/util/async-components
'
;
...
...
@@ -47,7 +47,7 @@ const notFoundFn = () => (
<
/div
>
);
class
ModifierPickerMenu
extends
React
.
PureComponent
{
class
ModifierPickerMenu
extends
PureComponent
{
static
propTypes
=
{
active
:
PropTypes
.
bool
,
...
...
@@ -59,7 +59,7 @@ class ModifierPickerMenu extends React.PureComponent {
this
.
props
.
onSelect
(
e
.
currentTarget
.
getAttribute
(
'
data-index
'
)
*
1
);
}
componentWillReceiveProps
(
nextProps
)
{
UNSAFE_
componentWillReceiveProps
(
nextProps
)
{
if
(
nextProps
.
active
)
{
this
.
attachListeners
();
}
else
{
...
...
@@ -108,7 +108,7 @@ class ModifierPickerMenu extends React.PureComponent {
}
class
ModifierPicker
extends
React
.
PureComponent
{
class
ModifierPicker
extends
PureComponent
{
static
propTypes
=
{
active
:
PropTypes
.
bool
,
...
...
@@ -145,7 +145,7 @@ class ModifierPicker extends React.PureComponent {
}
@
injectIntl
class
EmojiPickerMenu
extends
React
.
PureComponent
{
class
EmojiPickerMenu
extends
PureComponent
{
static
propTypes
=
{
custom_emojis
:
ImmutablePropTypes
.
list
,
...
...
@@ -309,7 +309,7 @@ class EmojiPickerMenu extends React.PureComponent {
}
export
default
@
injectIntl
class
EmojiPickerDropdown
extends
React
.
PureComponent
{
class
EmojiPickerDropdown
extends
PureComponent
{
static
propTypes
=
{
custom_emojis
:
ImmutablePropTypes
.
list
,
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/language_dropdown.js
+
3
-
3
View file @
83b21e90
import
React
from
'
react
'
;
import
{
PureComponent
}
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
import
{
injectIntl
,
defineMessages
}
from
'
react-intl
'
;
import
TextIconButton
from
'
./text_icon_button
'
;
...
...
@@ -34,7 +34,7 @@ const icons = {
const
listenerOptions
=
supportsPassiveEvents
?
{
passive
:
true
}
:
false
;
class
LanguageDropdownMenu
extends
React
.
PureComponent
{
class
LanguageDropdownMenu
extends
PureComponent
{
static
propTypes
=
{
style
:
PropTypes
.
object
,
...
...
@@ -257,7 +257,7 @@ class LanguageDropdownMenu extends React.PureComponent {
}
export
default
@
injectIntl
class
LanguageDropdown
extends
React
.
PureComponent
{
class
LanguageDropdown
extends
PureComponent
{
static
propTypes
=
{
value
:
PropTypes
.
string
,
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/navigation_bar.js
+
0
-
1
View file @
83b21e90
import
React
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
import
ImmutablePropTypes
from
'
react-immutable-proptypes
'
;
import
ActionBar
from
'
./action_bar
'
;
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/poll_button.js
+
2
-
2
View file @
83b21e90
import
React
from
'
react
'
;
import
{
PureComponent
}
from
'
react
'
;
import
IconButton
from
'
../../../components/icon_button
'
;
import
PropTypes
from
'
prop-types
'
;
import
{
defineMessages
,
injectIntl
}
from
'
react-intl
'
;
...
...
@@ -15,7 +15,7 @@ const iconStyle = {
export
default
@
injectIntl
class
PollButton
extends
React
.
PureComponent
{
class
PollButton
extends
PureComponent
{
static
propTypes
=
{
disabled
:
PropTypes
.
bool
,
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/poll_form.js
+
2
-
2
View file @
83b21e90
import
React
from
'
react
'
;
import
{
PureComponent
}
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
import
ImmutablePropTypes
from
'
react-immutable-proptypes
'
;
import
ImmutablePureComponent
from
'
react-immutable-pure-component
'
;
...
...
@@ -21,7 +21,7 @@ const messages = defineMessages({
});
@
injectIntl
class
Option
extends
React
.
PureComponent
{
class
Option
extends
PureComponent
{
static
propTypes
=
{
title
:
PropTypes
.
string
.
isRequired
,
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/privacy_dropdown.js
+
4
-
4
View file @
83b21e90
import
React
from
'
react
'
;
import
{
PureComponent
}
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
import
{
injectIntl
,
defineMessages
}
from
'
react-intl
'
;
import
IconButton
from
'
../../../components/icon_button
'
;
...
...
@@ -23,7 +23,7 @@ const messages = defineMessages({
const
listenerOptions
=
supportsPassiveEvents
?
{
passive
:
true
}
:
false
;
class
PrivacyDropdownMenu
extends
React
.
PureComponent
{
class
PrivacyDropdownMenu
extends
PureComponent
{
static
propTypes
=
{
style
:
PropTypes
.
object
,
...
...
@@ -149,7 +149,7 @@ class PrivacyDropdownMenu extends React.PureComponent {
}
export
default
@
injectIntl
class
PrivacyDropdown
extends
React
.
PureComponent
{
class
PrivacyDropdown
extends
PureComponent
{
static
propTypes
=
{
isUserTouching
:
PropTypes
.
func
,
...
...
@@ -231,7 +231,7 @@ class PrivacyDropdown extends React.PureComponent {
this
.
props
.
onChange
(
value
);
}
componentWillMount
()
{
UNSAFE_
componentWillMount
()
{
const
{
intl
:
{
formatMessage
}
}
=
this
.
props
;
this
.
options
=
[
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/reply_indicator.js
+
0
-
1
View file @
83b21e90
import
React
from
'
react
'
;
import
ImmutablePropTypes
from
'
react-immutable-proptypes
'
;
import
PropTypes
from
'
prop-types
'
;
import
Avatar
from
'
../../../components/avatar
'
;
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/search.js
+
3
-
3
View file @
83b21e90
import
React
from
'
react
'
;
import
{
PureComponent
}
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
import
{
defineMessages
,
injectIntl
,
FormattedMessage
}
from
'
react-intl
'
;
import
Overlay
from
'
react-overlays/lib/Overlay
'
;
...
...
@@ -11,7 +11,7 @@ const messages = defineMessages({
placeholder
:
{
id
:
'
search.placeholder
'
,
defaultMessage
:
'
Search
'
},
});
class
SearchPopout
extends
React
.
PureComponent
{
class
SearchPopout
extends
PureComponent
{
static
propTypes
=
{
style
:
PropTypes
.
object
,
...
...
@@ -45,7 +45,7 @@ class SearchPopout extends React.PureComponent {
}
export
default
@
injectIntl
class
Search
extends
React
.
PureComponent
{
class
Search
extends
PureComponent
{
static
contextTypes
=
{
router
:
PropTypes
.
object
.
isRequired
,
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/search_results.js
+
0
-
1
View file @
83b21e90
import
React
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
import
ImmutablePropTypes
from
'
react-immutable-proptypes
'
;
import
{
FormattedMessage
,
defineMessages
,
injectIntl
}
from
'
react-intl
'
;
...
...
This diff is collapsed.
Click to expand it.
app/javascript/mastodon/features/compose/components/text_icon_button.js
+
2
-
2
View file @
83b21e90
import
React
from
'
react
'
;
import
{
PureComponent
}
from
'
react
'
;
import
PropTypes
from
'
prop-types
'
;
const
iconStyle
=
{
...
...
@@ -7,7 +7,7 @@ const iconStyle = {
width
:
`
${
18
*
1.28571429
}
px`
,
};
export
default
class
TextIconButton
extends
React
.
PureComponent
{
export
default
class
TextIconButton
extends
PureComponent
{
static
propTypes
=
{
label
:
PropTypes
.
string
.
isRequired
,
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
3
4
5
6
7
8
9
…
12
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets