From bfe46d08f97b4b19ab6f86c32be01cce945517d0 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Tue, 4 Apr 2023 10:33:44 -0400 Subject: [PATCH] [Glitch] Ensure tabIndex is number instead of string Port ec0c104bf25f2689c31bb79f9f447be1a9b3da7f to glitch-soc Signed-off-by: Claire --- .../glitch/components/admin/ReportReasonSelector.jsx | 4 ++-- .../flavours/glitch/components/autosuggest_input.jsx | 2 +- .../glitch/components/autosuggest_textarea.jsx | 2 +- .../glitch/components/column_back_button_slim.jsx | 2 +- .../flavours/glitch/components/dropdown_menu.jsx | 2 +- .../flavours/glitch/components/error_boundary.jsx | 2 +- app/javascript/flavours/glitch/components/gifv.jsx | 4 ++-- .../components/intersection_observer_article.jsx | 2 +- .../components/picture_in_picture_placeholder.jsx | 2 +- app/javascript/flavours/glitch/components/poll.jsx | 2 +- app/javascript/flavours/glitch/components/spoilers.jsx | 2 +- app/javascript/flavours/glitch/components/status.jsx | 6 +++--- .../flavours/glitch/components/status_content.jsx | 10 +++++----- .../flavours/glitch/features/about/index.jsx | 2 +- .../features/account/components/account_note.jsx | 6 +++--- .../flavours/glitch/features/audio/index.jsx | 8 ++++---- .../features/compose/components/dropdown_menu.jsx | 2 +- .../features/compose/components/language_dropdown.jsx | 2 +- .../glitch/features/compose/components/search.jsx | 2 +- .../glitch/features/compose/components/upload.jsx | 2 +- .../direct_timeline/components/conversation.jsx | 2 +- .../flavours/glitch/features/filters/select_filter.jsx | 4 ++-- .../glitch/features/list_editor/components/search.jsx | 2 +- .../flavours/glitch/features/list_editor/index.jsx | 2 +- .../flavours/glitch/features/list_timeline/index.jsx | 4 ++-- .../features/local_settings/navigation/item/index.jsx | 2 +- .../features/notifications/components/admin_report.jsx | 2 +- .../features/notifications/components/admin_signup.jsx | 2 +- .../notifications/components/clear_column_button.jsx | 2 +- .../features/notifications/components/follow.jsx | 2 +- .../notifications/components/follow_request.jsx | 2 +- .../components/grant_permission_button.jsx | 2 +- .../glitch/features/pinned_accounts_editor/index.jsx | 2 +- .../glitch/features/report/components/option.jsx | 2 +- .../flavours/glitch/features/status/index.jsx | 2 +- .../glitch/features/ui/components/actions_modal.jsx | 2 +- .../glitch/features/ui/components/column_link.jsx | 2 +- .../glitch/features/ui/components/media_modal.jsx | 4 ++-- .../glitch/features/ui/components/onboarding_modal.jsx | 2 +- .../flavours/glitch/features/video/index.jsx | 6 +++--- 40 files changed, 58 insertions(+), 58 deletions(-) diff --git a/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx b/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx index 8478ba3662..ecefe7a840 100644 --- a/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx +++ b/app/javascript/flavours/glitch/components/admin/ReportReasonSelector.jsx @@ -33,7 +33,7 @@ class Category extends React.PureComponent { const { id, text, disabled, selected, children } = this.props; return ( -
+
{selected && }
@@ -74,7 +74,7 @@ class Rule extends React.PureComponent { const { id, text, disabled, selected } = this.props; return ( -
+
{selected && } {text} diff --git a/app/javascript/flavours/glitch/components/autosuggest_input.jsx b/app/javascript/flavours/glitch/components/autosuggest_input.jsx index 90ff298c0d..ea9fd0828a 100644 --- a/app/javascript/flavours/glitch/components/autosuggest_input.jsx +++ b/app/javascript/flavours/glitch/components/autosuggest_input.jsx @@ -180,7 +180,7 @@ export default class AutosuggestInput extends ImmutablePureComponent { } return ( -
+
{inner}
); diff --git a/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx b/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx index 6e6e567b93..a016e44b72 100644 --- a/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx +++ b/app/javascript/flavours/glitch/components/autosuggest_textarea.jsx @@ -186,7 +186,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent { } return ( -
+
{inner}
); diff --git a/app/javascript/flavours/glitch/components/column_back_button_slim.jsx b/app/javascript/flavours/glitch/components/column_back_button_slim.jsx index b43d85b3b0..4df045b5fb 100644 --- a/app/javascript/flavours/glitch/components/column_back_button_slim.jsx +++ b/app/javascript/flavours/glitch/components/column_back_button_slim.jsx @@ -26,7 +26,7 @@ export default class ColumnBackButtonSlim extends React.PureComponent { render () { return (
-
+
diff --git a/app/javascript/flavours/glitch/components/dropdown_menu.jsx b/app/javascript/flavours/glitch/components/dropdown_menu.jsx index f4b6e059fc..7fb75b59ea 100644 --- a/app/javascript/flavours/glitch/components/dropdown_menu.jsx +++ b/app/javascript/flavours/glitch/components/dropdown_menu.jsx @@ -119,7 +119,7 @@ class DropdownMenu extends React.PureComponent { return (
  • - + {text}
  • diff --git a/app/javascript/flavours/glitch/components/error_boundary.jsx b/app/javascript/flavours/glitch/components/error_boundary.jsx index 8518dfc866..234a53417f 100644 --- a/app/javascript/flavours/glitch/components/error_boundary.jsx +++ b/app/javascript/flavours/glitch/components/error_boundary.jsx @@ -72,7 +72,7 @@ export default class ErrorBoundary extends React.PureComponent { } return ( -
    +

    diff --git a/app/javascript/flavours/glitch/components/gifv.jsx b/app/javascript/flavours/glitch/components/gifv.jsx index 9ec201c6cc..1ce7e7c29b 100644 --- a/app/javascript/flavours/glitch/components/gifv.jsx +++ b/app/javascript/flavours/glitch/components/gifv.jsx @@ -46,7 +46,7 @@ export default class GIFV extends React.PureComponent { width={width} height={height} role='button' - tabIndex='0' + tabIndex={0} aria-label={alt} title={alt} lang={lang} @@ -57,7 +57,7 @@ export default class GIFV extends React.PureComponent {

    +
    diff --git a/app/javascript/flavours/glitch/components/poll.jsx b/app/javascript/flavours/glitch/components/poll.jsx index 2ccc1761e4..fb37612d9c 100644 --- a/app/javascript/flavours/glitch/components/poll.jsx +++ b/app/javascript/flavours/glitch/components/poll.jsx @@ -154,7 +154,7 @@ class Poll extends ImmutablePureComponent { {!showResults && ( {spoilerText} {' '} -

    , diff --git a/app/javascript/flavours/glitch/components/status.jsx b/app/javascript/flavours/glitch/components/status.jsx index fa90c98d02..fbb610823a 100644 --- a/app/javascript/flavours/glitch/components/status.jsx +++ b/app/javascript/flavours/glitch/components/status.jsx @@ -564,7 +564,7 @@ class Status extends ImmutablePureComponent { if (hidden) { return ( -
    +
    {status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])} {status.get('content')}
    @@ -581,7 +581,7 @@ class Status extends ImmutablePureComponent { return ( -
    +
    : {matchedFilters.join(', ')}. {' '}
    -
    @@ -65,7 +65,7 @@ class Header extends ImmutablePureComponent { } else { action_buttons = (
    -
    diff --git a/app/javascript/flavours/glitch/features/audio/index.jsx b/app/javascript/flavours/glitch/features/audio/index.jsx index fd7229cc56..556a74ac48 100644 --- a/app/javascript/flavours/glitch/features/audio/index.jsx +++ b/app/javascript/flavours/glitch/features/audio/index.jsx @@ -476,7 +476,7 @@ class Audio extends React.PureComponent { } return ( -
    +
    @@ -549,7 +549,7 @@ class Audio extends React.PureComponent {
    diff --git a/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx b/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx index 1ea0df536c..1ccccad31a 100644 --- a/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/dropdown_menu.jsx @@ -169,7 +169,7 @@ export default class ComposerOptionsDropdownContent extends React.PureComponent onClick={this.handleClick} onKeyDown={this.handleKeyDown} role='option' - tabIndex='0' + tabIndex={0} key={name} data-index={i} ref={active ? this.setFocusRef : null} diff --git a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx index 14f285c3d2..05614de011 100644 --- a/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/language_dropdown.jsx @@ -209,7 +209,7 @@ class LanguageDropdownMenu extends React.PureComponent { const { value } = this.props; return ( -
    +
    {lang[2]} ({lang[1]})
    ); diff --git a/app/javascript/flavours/glitch/features/compose/components/search.jsx b/app/javascript/flavours/glitch/features/compose/components/search.jsx index d2187b8ae9..cb6afca8d3 100644 --- a/app/javascript/flavours/glitch/features/compose/components/search.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/search.jsx @@ -147,7 +147,7 @@ class Search extends React.PureComponent { onBlur={this.handleBlur} /> -
    +
    diff --git a/app/javascript/flavours/glitch/features/compose/components/upload.jsx b/app/javascript/flavours/glitch/features/compose/components/upload.jsx index 63582c6367..7d5784561c 100644 --- a/app/javascript/flavours/glitch/features/compose/components/upload.jsx +++ b/app/javascript/flavours/glitch/features/compose/components/upload.jsx @@ -43,7 +43,7 @@ export default class Upload extends ImmutablePureComponent { const y = ((focusY / -2) + .5) * 100; return ( -
    +
    {({ scale }) => (
    diff --git a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx index 05fd68707f..63a331086b 100644 --- a/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx +++ b/app/javascript/flavours/glitch/features/direct_timeline/components/conversation.jsx @@ -182,7 +182,7 @@ class Conversation extends ImmutablePureComponent { return ( -
    +
    diff --git a/app/javascript/flavours/glitch/features/filters/select_filter.jsx b/app/javascript/flavours/glitch/features/filters/select_filter.jsx index b3285bc917..a33892f83f 100644 --- a/app/javascript/flavours/glitch/features/filters/select_filter.jsx +++ b/app/javascript/flavours/glitch/features/filters/select_filter.jsx @@ -65,7 +65,7 @@ class SelectFilter extends React.PureComponent { } return ( -
    +
    {filter[1]} {warning}
    ); @@ -73,7 +73,7 @@ class SelectFilter extends React.PureComponent { renderCreateNew (name) { return ( -
    +
    ); diff --git a/app/javascript/flavours/glitch/features/list_editor/components/search.jsx b/app/javascript/flavours/glitch/features/list_editor/components/search.jsx index 94782ba69a..3b66bc325d 100644 --- a/app/javascript/flavours/glitch/features/list_editor/components/search.jsx +++ b/app/javascript/flavours/glitch/features/list_editor/components/search.jsx @@ -51,7 +51,7 @@ export default class Search extends React.PureComponent { /> -
    +
    diff --git a/app/javascript/flavours/glitch/features/list_editor/index.jsx b/app/javascript/flavours/glitch/features/list_editor/index.jsx index 8b8a0cf310..44951d1c64 100644 --- a/app/javascript/flavours/glitch/features/list_editor/index.jsx +++ b/app/javascript/flavours/glitch/features/list_editor/index.jsx @@ -60,7 +60,7 @@ class ListEditor extends ImmutablePureComponent { {accountIds.map(accountId => )}
    - {showSearch &&
    } + {showSearch &&
    } {({ x }) => diff --git a/app/javascript/flavours/glitch/features/list_timeline/index.jsx b/app/javascript/flavours/glitch/features/list_timeline/index.jsx index f885a751f3..a32383b130 100644 --- a/app/javascript/flavours/glitch/features/list_timeline/index.jsx +++ b/app/javascript/flavours/glitch/features/list_timeline/index.jsx @@ -177,11 +177,11 @@ class ListTimeline extends React.PureComponent { multiColumn={multiColumn} >
    - -
    diff --git a/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.jsx b/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.jsx index a4d1b40fad..9ac6d9b73d 100644 --- a/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.jsx +++ b/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.jsx @@ -60,7 +60,7 @@ export default class LocalSettingsPage extends React.PureComponent { -
    +
    diff --git a/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx b/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx index ead2a9701b..d982108e92 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/admin_signup.jsx @@ -78,7 +78,7 @@ export default class NotificationFollow extends ImmutablePureComponent { // Renders. return ( -
    +
    diff --git a/app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx b/app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx index ee77cfb8e3..cd150314b7 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/clear_column_button.jsx @@ -11,7 +11,7 @@ export default class ClearColumnButton extends React.Component { render () { return ( - + ); } diff --git a/app/javascript/flavours/glitch/features/notifications/components/follow.jsx b/app/javascript/flavours/glitch/features/notifications/components/follow.jsx index 434d6609da..e9ef70911e 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/follow.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/follow.jsx @@ -78,7 +78,7 @@ export default class NotificationFollow extends ImmutablePureComponent { // Renders. return ( -
    +
    diff --git a/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx b/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx index 01dec320e2..2b985bc085 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/follow_request.jsx @@ -95,7 +95,7 @@ class FollowRequest extends ImmutablePureComponent { return ( -
    +
    diff --git a/app/javascript/flavours/glitch/features/notifications/components/grant_permission_button.jsx b/app/javascript/flavours/glitch/features/notifications/components/grant_permission_button.jsx index 798e4c7872..5b2db48fdb 100644 --- a/app/javascript/flavours/glitch/features/notifications/components/grant_permission_button.jsx +++ b/app/javascript/flavours/glitch/features/notifications/components/grant_permission_button.jsx @@ -10,7 +10,7 @@ export default class GrantPermissionButton extends React.PureComponent { render () { return ( - ); diff --git a/app/javascript/flavours/glitch/features/pinned_accounts_editor/index.jsx b/app/javascript/flavours/glitch/features/pinned_accounts_editor/index.jsx index de3fff8ece..834de652f5 100644 --- a/app/javascript/flavours/glitch/features/pinned_accounts_editor/index.jsx +++ b/app/javascript/flavours/glitch/features/pinned_accounts_editor/index.jsx @@ -59,7 +59,7 @@ class PinnedAccountsEditor extends ImmutablePureComponent { {accountIds.map(accountId => )}
    - {showSearch &&
    } + {showSearch &&
    } {({ x }) => diff --git a/app/javascript/flavours/glitch/features/report/components/option.jsx b/app/javascript/flavours/glitch/features/report/components/option.jsx index 6ecfc7a248..7827a6b3b3 100644 --- a/app/javascript/flavours/glitch/features/report/components/option.jsx +++ b/app/javascript/flavours/glitch/features/report/components/option.jsx @@ -40,7 +40,7 @@ export default class Option extends React.PureComponent { -
    +
    - {icon && } + {icon && }
    {text}
    {meta}
    diff --git a/app/javascript/flavours/glitch/features/ui/components/column_link.jsx b/app/javascript/flavours/glitch/features/ui/components/column_link.jsx index dcdac077fe..4fffa54f4c 100644 --- a/app/javascript/flavours/glitch/features/ui/components/column_link.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/column_link.jsx @@ -32,7 +32,7 @@ const ColumnLink = ({ icon, text, to, onClick, href, method, badge, transparent, return onClick(e); }; return ( - + {iconElement} {text} {badgeElement} diff --git a/app/javascript/flavours/glitch/features/ui/components/media_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/media_modal.jsx index a3811e91d3..fd2bd43cf5 100644 --- a/app/javascript/flavours/glitch/features/ui/components/media_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/media_modal.jsx @@ -140,8 +140,8 @@ class MediaModal extends ImmutablePureComponent { const index = this.getIndex(); - const leftNav = media.size > 1 && ; - const rightNav = media.size > 1 && ; + const leftNav = media.size > 1 && ; + const rightNav = media.size > 1 && ; const content = media.map((image) => { const width = image.getIn(['meta', 'original', 'width']) || null; diff --git a/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.jsx b/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.jsx index df84a15713..29eb91a6ba 100644 --- a/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/onboarding_modal.jsx @@ -299,7 +299,7 @@ class OnboardingModal extends React.PureComponent {
    @@ -645,7 +645,7 @@ class Video extends React.PureComponent {