@pocketprep/ui-kit 3.4.2 → 3.4.4

package/lib/components/Quiz/Question.vue

@@ -74,135 +74,31 @@
             >
                 Skip to Passage
             </PocketButton>
-            <div
+            <PassageAndImageDropdown
                 v-if="question.passage || passageImageUrl"
-                v-breakpoint:questionEl="breakpoints"
-                v-dark="isDarkMode"
+                ref="uikit-question__passage-and-image-dropdown"
                 class="uikit-question__passage-and-image-dropdown"
-                :class="{ 'uikit-question__passage-and-image-dropdown--review-mode': reviewMode }"
-            >
-                <div
-                    v-dark="isDarkMode"
-                    class="uikit-question__passage-and-image-dropdown-btn"
-                    tabindex="0"
-                    role="button"
-                    :aria-expanded="showPassageImageDropdown ? 'true' : 'false'"
-                    @click.stop="showPassageImageDropdown = !showPassageImageDropdown"
-                    @keydown.enter.stop="showPassageImageDropdown = !showPassageImageDropdown"
-                    @mousedown.prevent
-                >
-                    <Icon
-                        v-if="question.passage"
-                        class="uikit-question__passage-dropdown-icon"
-                        type="passage"
-                    />
-                    <Icon
-                        v-else
-                        class="uikit-question__image-dropdown-icon"
-                        type="image"
-                    />
-                    <span v-dark="isDarkMode" class="uikit-question__passage-and-image-dropdown-text">
-                        {{ showPassageImageDropdown ? 'Hide' : 'Show' }}
-                        {{ passageAndImageTitle }}
-                    </span>
-                    <Icon
-                        v-dark="isDarkMode"
-                        class="uikit-question__passage-and-image-dropdown-arrow"
-                        :class="{
-                            'uikit-question__passage-and-image-dropdown-arrow--up': showPassageImageDropdown,
-                        }"
-                        type="accordionArrow"
-                    />
-                </div>
-                <div
-                    v-if="showPassageImageDropdown"
-                    v-breakpoint:questionEl="breakpoints"
-                    class="uikit-question__passage-and-image-dropdown-container"
-                >
-                    <div
-                        v-if="question.passage"
-                        v-breakpoint:questionEl="breakpoints"
-                        class="uikit-question__passage-dropdown-passage"
-                        :class="{
-                            'uikit-question__passage-dropdown-passage--with-image': passageImageUrl,
-                        }"
-                        v-html="question.passage"
-                    />
-                    <img
-                        v-if="passageImageUrl"
-                        v-dark="isDarkMode"
-                        class="uikit-question__image-dropdown-image"
-                        :class="{
-                            'uikit-question__image-dropdown-image--with-passage': question.passage,
-                        }"
-                        :src="passageImageUrl"
-                        :alt="`${passageImageAlt}. Extended image description below.`"
-                    >
-                    <PocketButton
-                        v-if="passageImageLongAlt"
-                        v-breakpoint:questionEl="breakpoints"
-                        type="tertiary-small"
-                        class="uikit-question__toggle-img-dropdown-img-description"
-                        :class="{
-                            'uikit-question__toggle-img-dropdown-img-description--open': showPassageImageLongAlt,
-                        }"
-                        :is-dark-mode="isDarkMode"
-                        :aria-expanded="showPassageImageLongAlt ? 'true' : 'false'"
-                        @click.stop="togglePassageImageLongAlt"
-                        @mousedown.prevent
-                    >
-                        <span class="uikit-question__toggle-img-dropdown-img-description-text">Image Description</span>
-                        <Icon
-                            class="uikit-question__toggle-img-dropdown-img-description-icon"
-                            :class="{
-                                'uikit-question__toggle-img-dropdown-img-description-icon--up': showPassageImageLongAlt,
-                            }"
-                            type="accordionArrow"
-                        />
-                    </PocketButton>
-                    <div
-                        v-if="showPassageImageLongAlt"
-                        ref="uikit-question__img-dropdown-img-description"
-                        v-breakpoint:questionEl="breakpoints"
-                        v-dark="isDarkMode"
-                        class="uikit-question__img-dropdown-img-description"
-                        tabindex="-1"
-                        v-html="passageImageLongAlt"
-                    />
-                </div>
-            </div>
-            <div
+                :question="question"
+                :question-el="questionEl"
+                :breakpoints="breakpoints"
+                :is-dark-mode="isDarkMode"
+                :review-mode="reviewMode"
+                :image-url-prefix="imageUrlPrefix"
+                :passage-image-url="passageImageUrl"
+                :passage-image-long-alt="passageImageLongAlt"
+                :passage-image-alt="passageImageAlt"
+                :passage-and-image-title="passageAndImageTitle"
+                @emitTogglePassageImageLongAlt="togglePassageImageLongAlt"
+            />
+            <Paywall
                 v-if="showPaywall"
-                class="uikit-question__paywall-container"
-            >
-                <div
-                    v-dark="isDarkMode"
-                    v-breakpoint:questionEl="breakpoints" 
-                    class="uikit-question__paywall"
-                    :class="{ 'uikit-question__paywall--review': reviewMode }"
-                >
-                    <img
-                        v-breakpoint:questionEl="breakpoints"
-                        :src="isDarkMode ? paywallImages['dark'] : paywallImages['light']"
-                        alt=""
-                        class="uikit-question__paywall-image"
-                    >
-                    <div
-                        v-dark="isDarkMode"
-                        v-breakpoint:questionEl="breakpoints"
-                        class="uikit-question__paywall-text"
-                    >
-                        You need a Premium Subscription to view this question's answer and explanation.
-                    </div>
-                    <PocketButton
-                        :is-dark-mode="isDarkMode"
-                        class="uikit-question__paywall-button"
-                        @click="emitUpgrade"
-                    >
-                        Upgrade to Premium
-                    </PocketButton>
-                </div>
-            </div>
+                class="uikit-question__paywall"
+                :review-Mode="reviewMode"
+                :is-dark-mode="isDarkMode"
+                :question-el="questionEl"
+                :breakpoints="breakpoints"
+                @upgradeClicked="emitUpgrade"
+            />
             <div
                 v-if="showAnswers && isTeachReview && isUnanswered"
                 v-dark="isDarkMode"
@@ -920,11 +816,11 @@ import type { ITableColumn, ITableSortSettings } from '../Tables/table'
 import Table from '../Tables/Table.vue'
 import OverflowTooltip from '../Tooltips/OverflowTooltip.vue'
 import QuestionContext from '../Quiz/Question/QuestionContext.vue'
+import PassageAndImageDropdown from '../Quiz/Question/PassageAndImageDropdown.vue'
+import Paywall from '../Quiz/Question/Paywall.vue'
 import type { Study } from '@pocketprep/types'
 import { breakpoint, dark } from '../../directives'
 import { studyModes } from '../../utils'
-import PaywallImageLight from '../../assets/question/paywall-light.png'
-import PaywallImageDark from '../../assets/question/paywall-dark.png'
 import type { Ref, TQuizMode, TChoiceKey, TChoice, TChoiceScores, TNamesRow, TViewNames } from './question'
 
 @Component({
@@ -934,6 +830,8 @@ import type { Ref, TQuizMode, TChoiceKey, TChoice, TChoiceScores, TNamesRow, TVi
         Table,
         OverflowTooltip,
         QuestionContext,
+        PassageAndImageDropdown,
+        Paywall,
     },
     directives: {
         breakpoint,
@@ -995,13 +893,6 @@ export default class Question extends Vue {
         isSortDisabled: true,
     }]
 
-    get paywallImages () {
-        return {
-            light: PaywallImageLight,
-            dark: PaywallImageDark,
-        }
-    }
-
     get breakpoints () {
         // Passing the container element (typically QuizContainer) allows us to bind to that element's width
         if (this.containerEl) {
@@ -1441,12 +1332,17 @@ export default class Question extends Vue {
 
         if (this.showPassageImageLongAlt) {
             setTimeout(() => {
-                const mobileLongAlt = this.$refs['uikit-question__img-dropdown-img-description'] as Ref
+                const mobileLongAltComp = 
+                    this.$refs['uikit-question__passage-and-image-dropdown'] as ComponentPublicInstance | undefined
+                const mobileImgDropdownImgDescription = 
+                    // eslint-disable-next-line max-len
+                    mobileLongAltComp?.$refs['uikit-question-passage-and-image-dropdown__img-dropdown-img-description'] as HTMLElement | undefined
+
                 const longAlt = this.$refs['uikit-question__passage-image-description'] as Ref
 
                 // Checking offsetParent tells us which element is visible
-                if (mobileLongAlt?.offsetParent) {
-                    mobileLongAlt.focus()
+                if (mobileImgDropdownImgDescription?.offsetParent) {
+                    mobileImgDropdownImgDescription.focus()
                 } else if (longAlt?.offsetParent) {
                     longAlt.focus()
                 }
@@ -1806,7 +1702,6 @@ export default class Question extends Vue {
 
     &__toggle-passage-image-description-text,
     &__toggle-explanation-img-description-text,
-    &__toggle-img-dropdown-img-description-text,
     &__toggle-dropdown-explanation-img-description-text,
     &__toggle-summary-dropdown-explanation-img-description-text {
         outline: none;
@@ -1814,7 +1709,6 @@ export default class Question extends Vue {
 
     &__toggle-passage-image-description-icon,
     &__toggle-explanation-img-description-icon,
-    &__toggle-img-dropdown-img-description-icon,
     &__toggle-dropdown-explanation-img-description-icon,
     &__toggle-summary-dropdown-explanation-img-description-icon {
         margin-left: 8px;
@@ -2137,182 +2031,6 @@ export default class Question extends Vue {
         }
     }
 
-    &__passage-and-image-dropdown-btn {
-        position: relative;
-        display: flex;
-        align-items: center;
-        border: 1px solid rgba($pewter, 0.85);
-        border-radius: 5px;
-        box-shadow: 0 1px 4px 0 rgba($ash, 0.3);
-        box-sizing: border-box;
-        height: 50px;
-        padding: 15px 57px 16px 48px;
-        margin: -1px;
-        cursor: pointer;
-        outline: none;
-
-        &:hover {
-            .uikit-question__passage-and-image-dropdown-text {
-                color: mix($brand-blue, black, 90%);
-            }
-
-            .uikit-question__passage-and-image-dropdown-arrow {
-                color: mix($brand-blue, black, 90%);
-            }
-
-            &::before {
-                content: '';
-                left: -2px;
-                top: -2px;
-                width: 100%;
-                height: 100%;
-                border: 2px solid $slate;
-                position: absolute;
-                border-radius: 5px;
-            }
-        }
-
-        &:focus::before {
-            content: '';
-            left: -3px;
-            top: -3px;
-            width: calc(100% + 4px);
-            height: calc(100% + 4px);
-            border: 1px solid $brand-blue;
-            position: absolute;
-            border-radius: 8px;
-        }
-
-        &--dark {
-            box-shadow: 0 1px 4px 0 rgba($jet, 0.3);
-            border-color: $slate;
-
-            &:hover {
-                .uikit-question__passage-and-image-dropdown-text {
-                    color: $butterscotch;
-                }
-
-                .uikit-question__passage-and-image-dropdown-arrow {
-                    color: $butterscotch;
-                }
-
-                &::before {
-                    border-color: rgba($white, 0.6);
-                }
-            }
-
-            &:focus::before {
-                border-color: $banana-bread;
-            }
-        }
-    }
-
-    &__passage-and-image-dropdown-text {
-        font-size: 16px;
-        line-height: 24px;
-        font-weight: 600;
-        color: $brand-blue;
-
-        &--dark {
-            color: $banana-bread;
-        }
-    }
-
-    &__passage-dropdown-icon,
-    &__image-dropdown-icon {
-        position: absolute;
-        left: 17px;
-        width: 19px;
-    }
-
-    &__passage-and-image-dropdown-arrow {
-        position: absolute;
-        right: 20px;
-        color: $brand-blue;
-
-        &--dark {
-            color: $banana-bread;
-        }
-
-        &--up {
-            transform: rotate(180deg);
-        }
-    }
-
-    &__passage-and-image-dropdown-container {
-        padding: 14px 15px 16px 16px;
-
-        &--mobile {
-            padding: 12px 15px 16px 15px;
-        }
-    }
-
-    &__passage-dropdown-passage {
-        box-sizing: border-box;
-        margin: 14px 20px 24px 17px;
-        line-height: 24px;
-        font-size: 16px;
-        font-weight: 400;
-        letter-spacing: -0.1;
-
-        &--mobile {
-            line-height: 24px;
-            font-size: 16px;
-        }
-
-        &--with-image {
-            margin-bottom: 16px;
-        }
-    }
-
-    &__image-dropdown-image {
-        display: block;
-        box-sizing: border-box;
-        width: 100%;
-        border: 1px solid $fog;
-
-        &--with-passage {
-            padding-top: 0;
-        }
-
-        &--dark {
-            border: 1px solid $jet;
-        }
-    }
-
-    &__toggle-img-dropdown-img-description {
-        margin-top: 16px;
-
-        &--open {
-            margin-bottom: 8px;
-        }
-    }
-
-    &__img-dropdown-img-description {
-        outline: none;
-        color: $ash;
-        font-size: 15px;
-        line-height: 22px;
-        font-weight: 500;
-        letter-spacing: -0.2;
-
-        &--dark {
-            color: $fog;
-        }
-
-        &--tablet-landscape {
-            margin-bottom: 4px;
-        }
-
-        &--tablet-portrait {
-            margin-bottom: 0;
-        }
-
-        p {
-            margin: 0;
-        }
-    }
-
     &__unanswered-teach-review-label {
         margin-bottom: 12px;
         display: flex;
@@ -3274,76 +2992,5 @@ export default class Question extends Vue {
             margin-top: 24px;
         }
     }
-
-    &__paywall-container {
-        width: 100%;
-        display: flex;
-        justify-content: center;
-    }
-
-    &__paywall {
-        width: 100%;
-        max-width: 500px;
-        background: $white;
-        border-radius: 8px;
-        border: 1px solid $steel;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-
-        &--dark {
-            background: $brand-black;
-        }
-
-        &--tablet-portrait {
-            max-width: 430px;
-        }
-
-        &--review {
-            margin-bottom: 20px;
-        }
-    }
-
-    &__paywall-image {
-        width: 305px;
-        height: 230px;
-        margin: 25px auto 21px;
-
-        &--mobile {
-            width: 262px;
-            height: 199px;
-            margin: 14px auto 18px;
-        }
-    }
-
-    &__paywall-text {
-        font-size: 18px;
-        line-height: 22px;
-        color: $brand-black;
-        margin-bottom: 24px;
-        font-weight: 600;
-        text-align: center;
-        max-width: 372px;
-
-        &--dark {
-            color: $white;
-        }
-
-        &--tablet-portrait {
-            max-width: 302px;
-        }
-
-        &--mobile {
-            max-width: 293px;
-            margin-bottom: 22px;
-            font-size: 16px;
-            line-height: 19px;
-        }
-    }
-
-    &__paywall-button {
-        margin-bottom: 36px;
-    }
 }
 </style>

package/lib/components/Quiz/question.d.ts

@@ -20,6 +20,8 @@ export type TChoiceScores = Partial<Record<TChoiceKey, number>> & {
     answeredCorrectly: number
 }
 
+export type TQuestionPassageAndImageTitle = 'Passage + Image' | 'Image' | 'Passage'
+
 export type TNamesRow = {
     id: string
     nameOne: string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pocketprep/ui-kit",
-  "version": "3.4.2",
+  "version": "3.4.4",
   "description": "Pocket Prep UI Kit",
   "author": "pocketprep",
   "scripts": {