Merge pull request #2112 from themeum/dev

v3.8.1 merged to master

Author: harunollyo

.github/workflows/phpstan.yml

@@ -0,0 +1,27 @@
+name: PHPStan
+
+on: [push, pull_request]
+
+jobs:
+  phpstan:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
+          tools: composer
+
+      - name: Install dependencies
+        run: composer install --no-progress --prefer-dist
+
+      - name: Run PHPStan on changed files
+        run: |
+          CHANGED_FILES=$(git diff --name-only origin/${{ github.base_ref }}...HEAD | grep '\.php$' || true)
+          if [ -n "$CHANGED_FILES" ]; then
+            vendor/bin/phpstan analyse $CHANGED_FILES
+          else
+            echo "No PHP files changed, skipping PHPStan."
+          fi

assets/react/front/course/_spotlight-quiz.js

@@ -1,6 +1,9 @@
 window.jQuery(document).ready($ => {
     const { __ } = window.wp.i18n;
 
+    // Currently only these types of question supports answer reveal mode.
+    const revealModeSupportedQuestions = ['true_false', 'single_choice', 'multiple_choice'];
+
     let quiz_options = _tutorobject.quiz_options
     let interactions = new Map();
 
@@ -271,7 +274,7 @@ window.jQuery(document).ready($ => {
                  * @since 1.8.10
                  */
 
-                if (is_reveal_mode()) {
+                if (is_reveal_mode() && revealModeSupportedQuestions.includes($question_wrap.data('question-type'))) {
                     setTimeout(() => {
                         $('.quiz-attempt-single-question').hide();
                         $nextQuestion.show();
@@ -346,11 +349,16 @@ window.jQuery(document).ready($ => {
 
         let quiz_validated = true;
         let feedback_validated = true;
+        let hasAnyRevealModeQuestion = false;
 
         if ($questions_wrap.length) {
             $questions_wrap.each(function (index, question) {
                 quiz_validated = tutor_quiz_validation($(question), quiz_validated);
                 feedback_validated = feedback_response($(question));
+
+                if (revealModeSupportedQuestions.includes($(question).data('question-type'))) {
+                    hasAnyRevealModeQuestion = true;
+                }
             });
         }
         //If auto submit option is enabled after time expire submit current progress
@@ -361,7 +369,7 @@ window.jQuery(document).ready($ => {
 
         if (quiz_validated && feedback_validated) {
             let wait = 500
-            if (is_reveal_mode() && get_quiz_layout_view() === 'question_below_each_other') {
+            if (is_reveal_mode() && get_quiz_layout_view() === 'question_below_each_other' && hasAnyRevealModeQuestion) {
                 wait = get_reveal_wait_time()
                 submitted_form.find(':submit').addClass('is-loading').attr('disabled', 'disabled')
             }
@@ -376,9 +384,12 @@ window.jQuery(document).ready($ => {
 
     $(".tutor-quiz-submit-btn").click(function (event) {
         event.preventDefault();
+        var $questions_wrap = $('.quiz-attempt-single-question');
 
-        if (is_reveal_mode()) {
-            var $questions_wrap = $('.quiz-attempt-single-question');
+        const lastQuestion = $questions_wrap[$questions_wrap.length - 1];
+        const lastQuestionType = $(lastQuestion).data('question-type');
+
+        if (is_reveal_mode() && revealModeSupportedQuestions.includes(lastQuestionType)) {
             var validated = true;
             if ($questions_wrap.length) {
                 $questions_wrap.each(function (index, question) {

assets/react/v3/entries/addon-list/components/AddonCard.tsx

@@ -1,15 +1,19 @@
 import { css } from '@emotion/react';
+import { __ } from '@wordpress/i18n';
+import { useRef, useState } from 'react';
+
 import SVGIcon from '@TutorShared/atoms/SVGIcon';
 import Switch from '@TutorShared/atoms/Switch';
 import { useToast } from '@TutorShared/atoms/Toast';
 import Tooltip from '@TutorShared/atoms/Tooltip';
+
 import { tutorConfig } from '@TutorShared/config/config';
 import { borderRadius, colorTokens, fontSize, fontWeight, lineHeight, spacing } from '@TutorShared/config/styles';
 import Show from '@TutorShared/controls/Show';
 import { AnimationType } from '@TutorShared/hooks/useAnimation';
+import { POPOVER_PLACEMENTS } from '@TutorShared/hooks/usePortalPopover';
 import Popover from '@TutorShared/molecules/Popover';
-import { __ } from '@wordpress/i18n';
-import { useRef, useState } from 'react';
+
 import { useAddonContext } from '../contexts/addon-context';
 import { useEnableDisableAddon, type Addon } from '../services/addons';
 import InstallationPopover from './InstallationPopover';
@@ -125,8 +129,7 @@ function AddonCard({ addon }: { addon: Addon }) {
         closePopover={() => setIsOpen(false)}
         animationType={AnimationType.slideUp}
         closeOnEscape={false}
-        arrow="auto"
-        hideArrow
+        placement={POPOVER_PLACEMENTS.BOTTOM}
       >
         <Show
           when={!addon.required_settings}
@@ -172,7 +175,6 @@ const styles = {
 
     img {
       max-width: 100%;
-      border-radius: ${borderRadius.circle};
     }
   `,
   addonAction: css`

assets/react/v3/entries/addon-list/components/InstallationPopover.tsx

@@ -200,7 +200,6 @@ const styles = {
     height: 32px;
     width: 32px;
     overflow: hidden;
-    border-radius: ${borderRadius.circle};
 
     img {
       max-width: 100%;

assets/react/v3/entries/course-builder/components/additional/LiveClass.tsx

@@ -31,6 +31,7 @@ import ZoomMeetingForm from './meeting/ZoomMeetingForm';
 import liveClassPro2x from '@SharedImages/pro-placeholders/live-class-2x.webp';
 import liveClassPro from '@SharedImages/pro-placeholders/live-class.webp';
 import { withVisibilityControl } from '@TutorShared/hoc/withVisibilityControl';
+import { POPOVER_PLACEMENTS } from '@TutorShared/hooks/usePortalPopover';
 
 const isTutorPro = !!tutorConfig.tutor_pro_url;
 const isZoomAddonEnabled = isAddonEnabled(Addons.TUTOR_ZOOM_INTEGRATION);
@@ -173,8 +174,7 @@ const LiveClass = () => {
         closePopover={noop}
         animationType={AnimationType.slideUp}
         closeOnEscape={false}
-        arrow={CURRENT_VIEWPORT.isAboveMobile ? 'auto' : 'absoluteCenter'}
-        hideArrow
+        placement={CURRENT_VIEWPORT.isAboveMobile ? POPOVER_PLACEMENTS.BOTTOM : POPOVER_PLACEMENTS.ABSOLUTE_CENTER}
       >
         <ZoomMeetingForm
           data={null}
@@ -190,8 +190,8 @@ const LiveClass = () => {
         closePopover={noop}
         animationType={AnimationType.slideUp}
         closeOnEscape={false}
-        arrow={CURRENT_VIEWPORT.isAboveMobile ? 'auto' : 'absoluteCenter'}
-        hideArrow
+        placement={CURRENT_VIEWPORT.isAboveMobile ? POPOVER_PLACEMENTS.BOTTOM : POPOVER_PLACEMENTS.ABSOLUTE_CENTER}
+        arrow={false}
       >
         <GoogleMeetForm
           data={null}

assets/react/v3/entries/course-builder/components/additional/meeting/GoogleMeetCard.tsx

@@ -17,6 +17,7 @@ import { DateFormats } from '@TutorShared/config/constants';
 import { AnimationType } from '@TutorShared/hooks/useAnimation';
 import { styleUtils } from '@TutorShared/utils/style-utils';
 import { noop } from '@TutorShared/utils/util';
+
 import GoogleMeetForm from './GoogleMeetForm';
 
 interface GoogleMeetMeetingCardProps {
@@ -147,8 +148,6 @@ const GoogleMeetMeetingCard = ({ data, topicId }: GoogleMeetMeetingCardProps) =>
         }
         message={__('Are you sure you want to delete this meeting? This cannot be undone.', 'tutor')}
         animationType={AnimationType.slideUp}
-        arrow="auto"
-        hideArrow
         isLoading={deleteGoogleMeetMeetingMutation.isPending}
         confirmButton={{
           text: __('Delete', 'tutor'),

assets/react/v3/entries/course-builder/components/additional/meeting/ZoomMeetingCard.tsx

@@ -18,6 +18,7 @@ import { DateFormats } from '@TutorShared/config/constants';
 import { AnimationType } from '@TutorShared/hooks/useAnimation';
 import { styleUtils } from '@TutorShared/utils/style-utils';
 import { noop } from '@TutorShared/utils/util';
+
 import ZoomMeetingForm from './ZoomMeetingForm';
 
 interface ZoomMeetingCardProps {
@@ -165,8 +166,6 @@ const ZoomMeetingCard = ({ data, meetingHost, topicId }: ZoomMeetingCardProps) =
         }
         message={__('Are you sure you want to delete this meeting? This cannot be undone.', 'tutor')}
         animationType={AnimationType.slideUp}
-        arrow="auto"
-        hideArrow
         isLoading={deleteZoomMeetingMutation.isPending}
         confirmButton={{
           text: __('Delete', 'tutor'),

assets/react/v3/entries/course-builder/components/curriculum/Question.tsx

@@ -165,9 +165,7 @@ const Question = ({ question, index, onDuplicateQuestion, onRemoveQuestion, isOv
         dotsOrientation="vertical"
         maxWidth={isTutorPro ? '150px' : '160px'}
         isInverse
-        arrowPosition="auto"
         size="small"
-        hideArrow
         data-three-dots
       >
         {!validationError && contentType !== 'tutor_h5p_quiz' && (

assets/react/v3/entries/course-builder/components/curriculum/QuestionList.tsx

@@ -36,6 +36,7 @@ import { typography } from '@TutorShared/config/typography';
 import For from '@TutorShared/controls/For';
 import Show from '@TutorShared/controls/Show';
 import { AnimationType } from '@TutorShared/hooks/useAnimation';
+import { POPOVER_PLACEMENTS } from '@TutorShared/hooks/usePortalPopover';
 import { type IconCollection } from '@TutorShared/icons/types';
 import { convertedQuestion, validateQuizQuestion } from '@TutorShared/utils/quiz';
 import { styleUtils } from '@TutorShared/utils/style-utils';
@@ -408,11 +409,18 @@ const QuestionList = ({ isEditing }: { isEditing: boolean }) => {
         <Popover
           gap={4}
           maxWidth={'240px'}
-          arrow={CURRENT_VIEWPORT.isAboveTablet ? 'top' : CURRENT_VIEWPORT.isAboveMobile ? 'right' : 'absoluteCenter'}
+          placement={
+            CURRENT_VIEWPORT.isAboveTablet
+              ? POPOVER_PLACEMENTS.BOTTOM
+              : CURRENT_VIEWPORT.isAboveMobile
+                ? POPOVER_PLACEMENTS.LEFT
+                : POPOVER_PLACEMENTS.ABSOLUTE_CENTER
+          }
           triggerRef={addButtonRef}
           isOpen={isOpen}
           closePopover={() => setIsOpen(false)}
           animationType={AnimationType.slideUp}
+          arrow={true}
         >
           <div css={styles.questionOptionsWrapper}>
             <span css={styles.questionTypeOptionsTitle}>{__('Select Question Type', 'tutor')}</span>

assets/react/v3/entries/course-builder/components/curriculum/TopicContent.tsx

@@ -35,6 +35,7 @@ import { borderRadius, Breakpoint, colorTokens, spacing } from '@TutorShared/con
 import { typography } from '@TutorShared/config/typography';
 import Show from '@TutorShared/controls/Show';
 import { AnimationType } from '@TutorShared/hooks/useAnimation';
+import { POPOVER_PLACEMENTS } from '@TutorShared/hooks/usePortalPopover';
 import { type IconCollection } from '@TutorShared/icons/types';
 import { styleUtils } from '@TutorShared/utils/style-utils';
 import type { ID, TopicContentType } from '@TutorShared/utils/types';
@@ -365,8 +366,7 @@ const TopicContent = ({ type, topic, content, listeners, isDragging = false, onC
         closePopover={noop}
         maxWidth="306px"
         closeOnEscape={false}
-        arrow={CURRENT_VIEWPORT.isAboveMobile ? 'auto' : 'absoluteCenter'}
-        hideArrow
+        placement={CURRENT_VIEWPORT.isAboveMobile ? POPOVER_PLACEMENTS.BOTTOM : POPOVER_PLACEMENTS.ABSOLUTE_CENTER}
       >
         <Show when={meetingType === 'tutor_zoom_meeting'}>
           <ZoomMeetingForm
@@ -402,8 +402,6 @@ const TopicContent = ({ type, topic, content, listeners, isDragging = false, onC
           __('Are you sure you want to delete this content from your course? This cannot be undone.', 'tutor')
         }
         animationType={AnimationType.slideUp}
-        arrow="auto"
-        hideArrow
         confirmButton={{
           text: __('Delete', 'tutor'),
           variant: 'text',