about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-07-07 01:33:38 +0200
committerThibaut Girka <thib@sitedethib.com>2020-07-07 15:58:49 +0200
commit8b17d47e12390d62e813cf4b71b19390a8f39823 (patch)
tree1c908100f7b83754d72e6bdf0db9536ec88fa0af /app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js
parente9ad99bc93b6f65277956d997792ec40f08165cb (diff)
[Glitch] Fix hashtag column options styling
Port a783bdf4adee3444e9cd32c2eaa0712214ba1230 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Diffstat (limited to 'app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js')
-rw-r--r--app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js27
1 files changed, 15 insertions, 12 deletions
diff --git a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js
index 956f16734..27300f020 100644
--- a/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js
+++ b/app/javascript/flavours/glitch/features/hashtag_timeline/components/column_settings.js
@@ -4,6 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import Toggle from 'react-toggle';
 import AsyncSelect from 'react-select/async';
+import { NonceProvider } from 'react-select';
 import SettingToggle from '../../notifications/components/setting_toggle';
 
 const messages = defineMessages({
@@ -58,18 +59,20 @@ class ColumnSettings extends React.PureComponent {
           {this.modeLabel(mode)}
         </span>
 
-        <AsyncSelect
-          isMulti
-          autoFocus
-          value={this.tags(mode)}
-          onChange={this.onSelect(mode)}
-          loadOptions={this.props.onLoad}
-          className='column-select__container'
-          classNamePrefix='column-select'
-          name='tags'
-          placeholder={this.props.intl.formatMessage(messages.placeholder)}
-          noOptionsMessage={this.noOptionsMessage}
-        />
+        <NonceProvider nonce={document.querySelector('meta[name=style-nonce]').content}>
+          <AsyncSelect
+            isMulti
+            autoFocus
+            value={this.tags(mode)}
+            onChange={this.onSelect(mode)}
+            loadOptions={this.props.onLoad}
+            className='column-select__container'
+            classNamePrefix='column-select'
+            name='tags'
+            placeholder={this.props.intl.formatMessage(messages.placeholder)}
+            noOptionsMessage={this.noOptionsMessage}
+          />
+        </NonceProvider>
       </div>
     );
   }