From b61057f2dffe70bb937a6370d308ed17f1d2c4e6 Mon Sep 17 00:00:00 2001 From: Ihor Romaniuk Date: Wed, 12 Jan 2022 16:40:58 +0200 Subject: [PATCH] feat: add rtl support (#783) * feat: add rtl support for chart on progress tab * feat: change 'div' to semantic 'main' tag * fix: revert changing div to main tag --- .../grades/course-grade/CurrentGradeTooltip.jsx | 16 +++++++++++----- .../grades/course-grade/PassingGradeTooltip.jsx | 16 +++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx b/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx index 9c35b702..186020e1 100644 --- a/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx +++ b/src/course-home/progress-tab/grades/course-grade/CurrentGradeTooltip.jsx @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { useSelector } from 'react-redux'; -import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; +import { injectIntl, intlShape, isRtl } from '@edx/frontend-platform/i18n'; import { OverlayTrigger, Popover } from '@edx/paragon'; import { useModel } from '../../../../generic/model-store'; @@ -23,6 +23,12 @@ function CurrentGradeTooltip({ intl, tooltipClassName }) { const currentGrade = Number((visiblePercent * 100).toFixed(0)); + let currentGradeDirection = currentGrade < 50 ? '' : '-'; + + if (isRtl) { + currentGradeDirection = currentGrade < 50 ? '-' : ''; + } + return ( <> - - + + {intl.formatMessage(messages.currentGradeLabel)} diff --git a/src/course-home/progress-tab/grades/course-grade/PassingGradeTooltip.jsx b/src/course-home/progress-tab/grades/course-grade/PassingGradeTooltip.jsx index 4a7afdfd..ee8b5cb3 100644 --- a/src/course-home/progress-tab/grades/course-grade/PassingGradeTooltip.jsx +++ b/src/course-home/progress-tab/grades/course-grade/PassingGradeTooltip.jsx @@ -1,12 +1,18 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; +import { injectIntl, intlShape, isRtl } from '@edx/frontend-platform/i18n'; import { OverlayTrigger, Popover } from '@edx/paragon'; import messages from '../messages'; function PassingGradeTooltip({ intl, passingGrade, tooltipClassName }) { + let passingGradeDirection = passingGrade < 50 ? '' : '-'; + + if (isRtl) { + passingGradeDirection = passingGrade < 50 ? '-' : ''; + } + return ( <> - - + + {intl.formatMessage(messages.passingGradeLabel)}