[Glitch] Change RTL detection to rely on unicode-bidi paragraph by paragraph
Port 1f564051b6 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
			
			
This commit is contained in:
		@@ -4,7 +4,6 @@ import AutosuggestEmoji from './autosuggest_emoji';
 | 
			
		||||
import AutosuggestHashtag from './autosuggest_hashtag';
 | 
			
		||||
import ImmutablePropTypes from 'react-immutable-proptypes';
 | 
			
		||||
import PropTypes from 'prop-types';
 | 
			
		||||
import { isRtl } from 'flavours/glitch/util/rtl';
 | 
			
		||||
import ImmutablePureComponent from 'react-immutable-pure-component';
 | 
			
		||||
import classNames from 'classnames';
 | 
			
		||||
import { List as ImmutableList } from 'immutable';
 | 
			
		||||
@@ -189,11 +188,6 @@ export default class AutosuggestInput extends ImmutablePureComponent {
 | 
			
		||||
  render () {
 | 
			
		||||
    const { value, suggestions, disabled, placeholder, onKeyUp, autoFocus, className, id, maxLength } = this.props;
 | 
			
		||||
    const { suggestionsHidden } = this.state;
 | 
			
		||||
    const style = { direction: 'ltr' };
 | 
			
		||||
 | 
			
		||||
    if (isRtl(value)) {
 | 
			
		||||
      style.direction = 'rtl';
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return (
 | 
			
		||||
      <div className='autosuggest-input'>
 | 
			
		||||
@@ -212,7 +206,7 @@ export default class AutosuggestInput extends ImmutablePureComponent {
 | 
			
		||||
            onKeyUp={onKeyUp}
 | 
			
		||||
            onFocus={this.onFocus}
 | 
			
		||||
            onBlur={this.onBlur}
 | 
			
		||||
            style={style}
 | 
			
		||||
            dir='auto'
 | 
			
		||||
            aria-autocomplete='list'
 | 
			
		||||
            id={id}
 | 
			
		||||
            className={className}
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,6 @@ import AutosuggestEmoji from './autosuggest_emoji';
 | 
			
		||||
import AutosuggestHashtag from './autosuggest_hashtag';
 | 
			
		||||
import ImmutablePropTypes from 'react-immutable-proptypes';
 | 
			
		||||
import PropTypes from 'prop-types';
 | 
			
		||||
import { isRtl } from 'flavours/glitch/util/rtl';
 | 
			
		||||
import ImmutablePureComponent from 'react-immutable-pure-component';
 | 
			
		||||
import Textarea from 'react-textarea-autosize';
 | 
			
		||||
import classNames from 'classnames';
 | 
			
		||||
@@ -195,11 +194,6 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
 | 
			
		||||
  render () {
 | 
			
		||||
    const { value, suggestions, disabled, placeholder, onKeyUp, autoFocus, children } = this.props;
 | 
			
		||||
    const { suggestionsHidden } = this.state;
 | 
			
		||||
    const style = { direction: 'ltr' };
 | 
			
		||||
 | 
			
		||||
    if (isRtl(value)) {
 | 
			
		||||
      style.direction = 'rtl';
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return [
 | 
			
		||||
      <div className='compose-form__autosuggest-wrapper' key='autosuggest-wrapper'>
 | 
			
		||||
@@ -220,7 +214,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
 | 
			
		||||
              onFocus={this.onFocus}
 | 
			
		||||
              onBlur={this.onBlur}
 | 
			
		||||
              onPaste={this.onPaste}
 | 
			
		||||
              style={style}
 | 
			
		||||
              dir='auto'
 | 
			
		||||
              aria-autocomplete='list'
 | 
			
		||||
            />
 | 
			
		||||
          </label>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,6 @@
 | 
			
		||||
import React from 'react';
 | 
			
		||||
import ImmutablePropTypes from 'react-immutable-proptypes';
 | 
			
		||||
import PropTypes from 'prop-types';
 | 
			
		||||
import { isRtl } from 'flavours/glitch/util/rtl';
 | 
			
		||||
import { FormattedMessage } from 'react-intl';
 | 
			
		||||
import Permalink from './permalink';
 | 
			
		||||
import classnames from 'classnames';
 | 
			
		||||
@@ -277,16 +276,11 @@ export default class StatusContent extends React.PureComponent {
 | 
			
		||||
 | 
			
		||||
    const content = { __html: status.get('contentHtml') };
 | 
			
		||||
    const spoilerContent = { __html: status.get('spoilerHtml') };
 | 
			
		||||
    const directionStyle = { direction: 'ltr' };
 | 
			
		||||
    const classNames = classnames('status__content', {
 | 
			
		||||
      'status__content--with-action': parseClick && !disabled,
 | 
			
		||||
      'status__content--with-spoiler': status.get('spoiler_text').length > 0,
 | 
			
		||||
    });
 | 
			
		||||
 | 
			
		||||
    if (isRtl(status.get('search_index'))) {
 | 
			
		||||
      directionStyle.direction = 'rtl';
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (status.get('spoiler_text').length > 0) {
 | 
			
		||||
      let mentionsPlaceholder = '';
 | 
			
		||||
 | 
			
		||||
@@ -346,7 +340,6 @@ export default class StatusContent extends React.PureComponent {
 | 
			
		||||
            <div
 | 
			
		||||
              ref={this.setContentsRef}
 | 
			
		||||
              key={`contents-${tagLinks}`}
 | 
			
		||||
              style={directionStyle}
 | 
			
		||||
              tabIndex={!hidden ? 0 : null}
 | 
			
		||||
              dangerouslySetInnerHTML={content}
 | 
			
		||||
              className='status__content__text'
 | 
			
		||||
@@ -360,7 +353,6 @@ export default class StatusContent extends React.PureComponent {
 | 
			
		||||
      return (
 | 
			
		||||
        <div
 | 
			
		||||
          className={classNames}
 | 
			
		||||
          style={directionStyle}
 | 
			
		||||
          onMouseDown={this.handleMouseDown}
 | 
			
		||||
          onMouseUp={this.handleMouseUp}
 | 
			
		||||
          tabIndex='0'
 | 
			
		||||
@@ -380,7 +372,6 @@ export default class StatusContent extends React.PureComponent {
 | 
			
		||||
      return (
 | 
			
		||||
        <div
 | 
			
		||||
          className='status__content'
 | 
			
		||||
          style={directionStyle}
 | 
			
		||||
          tabIndex='0'
 | 
			
		||||
          ref={this.setRef}
 | 
			
		||||
        >
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user