@instructure/quiz-core 22.16.1 → 22.18.0

package/lib/building/components/layout/Sidebar/Stimulus/index.js

@@ -1,36 +1,79 @@
-import { bindActionCreators, compose } from 'redux';
-import { DragSource } from 'react-dnd';
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+import React, { useRef } from 'react';
+import { bindActionCreators } from 'redux';
 import { connect } from '../../../../../common/react-redux';
-import { ItemTypes, dragSource, collectDrag, DropTargetCreator } from '../../../../../common/components/shared/drag_and_drop/dragAndDropUtils';
+import { useQuizEntryDropTarget, useQuizEntryDragSource } from '../../../../../common/components/shared/drag_and_drop/dragAndDropUtils';
 import { newHoverPosition as newHoverPositionAction } from '../../../../../common/actions/dragAndDrop';
 import { set as setUI } from '../../../../../common/actions/ui';
 import { openMoveImmutableModal } from '../../../../../common/actions/modal';
 import { moveQuizEntry as moveQuizEntryAction } from '../../../../api/quizEntries';
 import { moveTemporaryQuizEntry as moveTemporaryQuizEntryAction } from '../../../../../common/actions/modifications';
 import Stimulus from './presenter';
-import { SIDEBAR_ITEM_REF } from '@instructure/quiz-common';
+import { SIDEBAR_ITEM_REF } from '@instructure/quiz-common/constants';
 import { getActiveQuiz } from '../../../../../common/selectors/quizzes';
 export var mapStateToProps = function() {
-    var state = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : Map(), props = arguments.length > 1 ? arguments[1] : void 0;
+    var state = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, props = arguments.length > 1 ? arguments[1] : void 0;
     var activeQuiz = getActiveQuiz(state);
     var quizEntriesIncludingTemp = activeQuiz.getWorkingQuizEntries();
     var itemsCollectionSize = quizEntriesIncludingTemp.size || quizEntriesIncludingTemp.length || 0;
-    var dndPosition = state.getIn([
-        'dragAndDrop',
-        'position'
-    ]);
-    var draggingAboveHalf = state.getIn([
-        'dragAndDrop',
-        'aboveHalf'
-    ], false);
+    var dndPosition = state.dragAndDrop.get('position');
+    var draggingAboveHalf = state.dragAndDrop.get('aboveHalf', false);
     var draggingOver = dndPosition === props.quizEntry.position;
-    var dropIntoEmptyStimulus = state.getIn([
-        'dragAndDrop',
-        'intoEmptyStimulus'
-    ]);
+    var dropIntoEmptyStimulus = state.dragAndDrop.get('intoEmptyStimulus');
     return {
         childEntries: props.quizEntry.getNestedEntries(),
-        dndPositionObj: draggingOver ? state.get('dragAndDrop') : null,
+        dndPositionObj: draggingOver ? state.dragAndDrop : null,
         draggingOver: draggingOver && props.draggingInSidebar,
         draggingAboveHalf: draggingOver && draggingAboveHalf,
         dropIntoEmptyStimulus: draggingOver && dropIntoEmptyStimulus,
@@ -47,10 +90,17 @@ export var mapDispatchToProps = function(dispatch) {
         setUi: bindActionCreators(setUI, dispatch)
     };
 };
-export var connectToDragSource = function(Component) {
-    return DragSource(// ItemTypes.QUIZ_ENTRY associates this component drag source with a name
-    // dragSource specifies functions React DnD will call for events with this component
-    // collectDrag injects props into component
-    ItemTypes.QUIZ_ENTRY, dragSource, collectDrag)(Component);
-};
-export default compose(connect(mapStateToProps, mapDispatchToProps), DropTargetCreator(SIDEBAR_ITEM_REF), connectToDragSource)(Stimulus);
+function StimulusDnd(props) {
+    var instanceRef = useRef(null);
+    var _useQuizEntryDropTarget = useQuizEntryDropTarget(SIDEBAR_ITEM_REF, props, instanceRef), connectDropTarget = _useQuizEntryDropTarget.connectDropTarget, isOver = _useQuizEntryDropTarget.isOver;
+    var _useQuizEntryDragSource = useQuizEntryDragSource(props), connectDragSource = _useQuizEntryDragSource.connectDragSource, connectDragPreview = _useQuizEntryDragSource.connectDragPreview, isDragging = _useQuizEntryDragSource.isDragging;
+    return /*#__PURE__*/ React.createElement(Stimulus, _object_spread_props(_object_spread({}, props), {
+        ref: instanceRef,
+        connectDropTarget: connectDropTarget,
+        isOver: isOver,
+        connectDragSource: connectDragSource,
+        connectDragPreview: connectDragPreview,
+        isDragging: isDragging
+    }));
+}
+export default connect(mapStateToProps, mapDispatchToProps)(StimulusDnd);

package/lib/building/components/layout/Sidebar/Stimulus/presenter.js

@@ -139,7 +139,7 @@ import DragAndDropZone from '../../../../../common/components/shared/drag_and_dr
 import CommonStimulus from '../../../../../common/components/layout/sidebar/Stimulus';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
-import { withStyleOverrides } from '@instructure/quiz-common';
+import { withStyleOverrides } from '@instructure/quiz-common/util/withStyleOverrides';
 export var BuildingStimulus = /*#__PURE__*/ function(Component) {
     "use strict";
     _inherits(BuildingStimulus, Component);

package/lib/building/components/layout/Sidebar/index.js

@@ -1,7 +1,60 @@
-import { bindActionCreators, compose } from 'redux';
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+import React, { useRef } from 'react';
+import { bindActionCreators } from 'redux';
 import { connect } from '../../../../common/react-redux';
-import { SIDEBAR_ITEM_REF } from '@instructure/quiz-common';
-import { DropTargetCreator } from '../../../../common/components/shared/drag_and_drop/dragAndDropUtils';
+import { SIDEBAR_ITEM_REF } from '@instructure/quiz-common/constants';
+import { useQuizEntryDropTarget } from '../../../../common/components/shared/drag_and_drop/dragAndDropUtils';
 import { newHoverPosition as newHoverPositionAction } from '../../../../common/actions/dragAndDrop';
 import { screenreaderNotification as screenreaderNotificationAction } from '../../../../common/actions/alerts';
 import { set as setUI } from '../../../../common/actions/ui';
@@ -17,12 +70,9 @@ export var mapStateToProps = function(state, props) {
     var workingQuizEntriesIncludingTemp = activeQuiz.getWorkingQuizEntries();
     var totalPointsPossible = getTotalPointsPossible(state, activeQuiz.id);
     return {
-        dndPositionObj: state.get('dragAndDrop'),
+        dndPositionObj: state.dragAndDrop,
         quizEntries: workingQuizEntriesIncludingTemp,
-        sidebarOpen: props.sidebarOpen || state.getIn([
-            'sidebar',
-            'isOpen'
-        ]),
+        sidebarOpen: props.sidebarOpen || state.sidebar.get('isOpen'),
         quizId: activeQuiz.id,
         totalPointsPossible: totalPointsPossible
     };
@@ -42,5 +92,14 @@ export var mapDispatchToProps = function(dispatch, props) {
 // Sidebar is a dropTarget to handle drops that occur on the sidebar,
 // but not directly on a sidebarItem (such as at the top or bottom).
 // it also uses the isOver prop to conditionally render dropZones on Build vs Sidebar
-export var BuildingSidebar = compose(connect(mapStateToProps, mapDispatchToProps), DropTargetCreator(SIDEBAR_ITEM_REF))(Sidebar);
+function SidebarDnd(props) {
+    var instanceRef = useRef(null);
+    var _useQuizEntryDropTarget = useQuizEntryDropTarget(SIDEBAR_ITEM_REF, props, instanceRef), connectDropTarget = _useQuizEntryDropTarget.connectDropTarget, isOver = _useQuizEntryDropTarget.isOver;
+    return /*#__PURE__*/ React.createElement(Sidebar, _object_spread_props(_object_spread({}, props), {
+        ref: instanceRef,
+        connectDropTarget: connectDropTarget,
+        isOver: isOver
+    }));
+}
+export var BuildingSidebar = connect(mapStateToProps, mapDispatchToProps)(SidebarDnd);
 export default BuildingSidebar;

package/lib/building/components/layout/Sidebar/presenter.js

@@ -98,10 +98,11 @@ import SidebarItem from './SidebarItem';
 import Stimulus from './Stimulus';
 import Sidebar from '../../../../common/components/layout/sidebar/Sidebar';
 import generateDisplayPositions from '../../../../common/util/generateDisplayPositions';
-import { extractTextFromHtml } from '@instructure/quiz-interactions';
+import extractTextFromHtml from '@instructure/quiz-interactions/util/extractTextFromHtml';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
-import { SIDEBAR_ITEM_REF, withStyleOverrides } from '@instructure/quiz-common';
+import { SIDEBAR_ITEM_REF } from '@instructure/quiz-common/constants';
+import { withStyleOverrides } from '@instructure/quiz-common/util/withStyleOverrides';
 import t from '@instructure/quiz-i18n/format-message';
 export var BuildingSidebar = /*#__PURE__*/ function(Component) {
     "use strict";

package/lib/building/components/layout/header/BuildingButtons/index.js

@@ -3,27 +3,26 @@ import partial from 'lodash/partial';
 import { connect } from '../../../../../common/react-redux';
 import * as modalActions from '../../../../../common/actions/modal';
 import { set as setUI } from '../../../../../common/actions/ui';
-import { BUILD_TRAY_OPEN, BUILD_TRAY_BUTTON_REF } from '@instructure/quiz-common';
+import { BUILD_TRAY_OPEN, BUILD_TRAY_BUTTON_REF } from '@instructure/quiz-common/constants';
 import { generateImportModalId } from '../../../../../common/components/ImportModal';
 import { BuildingButtons as BuildingButtonsPresenter } from './presenter';
 import { getActiveQuiz } from '../../../../../common/selectors/quizzes';
-import { featureOn } from '../../../../../common/util/featureCheck';
+import { Set } from 'immutable';
 import { startQuizExportJob } from '../../../../../common/actions/quizExport';
 import { addAlert, addInfo } from '../../../../../common/actions/alerts';
 export function mapStateToProps(state) {
     var quiz = getActiveQuiz(state);
+    var _state_features;
     return {
         activeQuizId: quiz.id,
-        canExport: !state.getIn([
-            'quizExport',
-            "activeQuiz".concat(quiz.id)
-        ]),
+        canExport: !state.quizExport.get("activeQuiz".concat(quiz.id)),
         canImport: quiz.canImport(),
         hasQuestions: quiz.hasQuestions(),
-        isEditing: state.get('editing') && state.get('editing').some(function(elem) {
+        isEditing: state.editing && state.editing.some(function(elem) {
             return elem;
         }),
-        printingEnabled: featureOn('printing')
+        isSurvey: quiz.isSurvey(),
+        printingEnabled: ((_state_features = state.features) !== null && _state_features !== void 0 ? _state_features : Set()).includes('printing')
     };
 }
 var mapDispatchToProps = function(dispatch) {

package/lib/building/components/layout/header/BuildingButtons/presenter.js

@@ -99,7 +99,8 @@ import { View } from '@instructure/ui-view';
 import { Drilldown } from '@instructure/ui-drilldown';
 import { TopNavBar } from '@instructure/ui-top-nav-bar';
 import PrintTrigger from '../../../../../common/components/shared/PrintTrigger';
-import { PRINT_CURRENT_PAGE, PRINT_BLANK, withStyleOverrides } from '@instructure/quiz-common';
+import { PRINT_CURRENT_PAGE, PRINT_BLANK } from '@instructure/quiz-common/constants';
+import { withStyleOverrides } from '@instructure/quiz-common/util/withStyleOverrides';
 import { jsx } from '@instructure/emotion';
 import t from '@instructure/quiz-i18n/format-message';
 import generateStyle from './styles';
@@ -269,6 +270,7 @@ export var BuildingButtons = /*#__PURE__*/ function(Component) {
                     return /*#__PURE__*/ jsx(Drilldown.Option, {
                         id: key,
                         key: key,
+                        disabled: this.props.isSurvey,
                         onOptionClick: onClick,
                         "data-automation": menuItemDataAutomation
                     }, /*#__PURE__*/ jsx(IconBankLine, {
@@ -280,6 +282,7 @@ export var BuildingButtons = /*#__PURE__*/ function(Component) {
                 }
                 return /*#__PURE__*/ jsx(Menu.Item, {
                     key: key,
+                    disabled: this.props.isSurvey,
                     onSelect: onClick,
                     "data-automation": menuItemDataAutomation
                 }, /*#__PURE__*/ jsx(IconBankLine, {
@@ -435,6 +438,7 @@ _define_property(BuildingButtons, "propTypes", {
     enableItemBanking: PropTypes.bool,
     hasQuestions: PropTypes.bool.isRequired,
     isEditing: PropTypes.bool.isRequired,
+    isSurvey: PropTypes.bool,
     navigateToBanks: PropTypes.func.isRequired,
     navigateToPreviewPrint: PropTypes.func.isRequired,
     openBanksTray: PropTypes.func.isRequired,
@@ -458,6 +462,7 @@ _define_property(BuildingButtons, "defaultProps", {
     contentExportEnabled: false,
     contentExport: null,
     enableItemBanking: true,
+    isSurvey: false,
     quizSaving: false,
     speedgraderLink: null,
     contextUuid: null,

package/lib/building/components/layout/header/SDKBuildingButtons/index.js

@@ -1,11 +1,12 @@
 import React from 'react';
-import { Provider } from '../../../../../common/react-redux';
-import store from '../../../../../reduxStore';
+import { SDKStoreProvider, useSDKStore } from '../../../../../common/react-redux';
 import BuildingButtons from '../BuildingButtons';
-export var SDKBuildingButtons = function(props) {
-    return /*#__PURE__*/ React.createElement(Provider, {
+export function SDKBuildingButtons(props) {
+    var store = useSDKStore();
+    if (!store) return null;
+    return /*#__PURE__*/ React.createElement(SDKStoreProvider, {
         store: store
     }, /*#__PURE__*/ React.createElement(BuildingButtons, props));
-};
+}
 SDKBuildingButtons.displayName = 'SDKBuildingButtons';
 export default SDKBuildingButtons;

package/lib/building/components/resources/ActionButtons/index.js

@@ -1,19 +1,20 @@
-import { Map } from 'immutable';
+import { Map, Set } from 'immutable';
 import { compose } from 'redux';
 import { connect } from '../../../../common/react-redux';
 import { ActionButtons as ActionButtonsPresenter } from './presenter';
 import disableDraggingOverride from '../../../../common/components/shared/functionality/disableDraggingOverride';
-import { ADD_CONTENT_POPOVER_KEY } from '@instructure/quiz-common';
-import { featureOn } from '../../../../common/util/featureCheck';
+import { ADD_CONTENT_POPOVER_KEY } from '@instructure/quiz-common/constants';
 function editingAddContentPopover(state) {
-    return state.get('editing', Map()).some(function(isEditing, componentKey) {
+    var _state_editing;
+    return ((_state_editing = state.editing) !== null && _state_editing !== void 0 ? _state_editing : Map()).some(function(isEditing, componentKey) {
         return componentKey.includes(ADD_CONTENT_POPOVER_KEY) && isEditing;
     });
 }
 function mapStateToProps(state) {
+    var _state_features;
     return {
         editingAddContentPopover: editingAddContentPopover(state),
-        questionCopyEnabled: featureOn('question_copy')
+        questionCopyEnabled: ((_state_features = state.features) !== null && _state_features !== void 0 ? _state_features : Set()).includes('question_copy')
     };
 }
 export var ActionButtons = compose(connect(mapStateToProps), disableDraggingOverride)(ActionButtonsPresenter);

package/lib/building/components/resources/ActionButtons/presenter.js

@@ -99,7 +99,8 @@ import { jsx, Global } from '@instructure/emotion';
 import DragHandle from '../../../../common/components/shared/drag_and_drop/DragHandle';
 import makeScrollable from '../../../../common/components/shared/functionality/makeScrollable';
 import noop from '../../../../common/util/noop';
-import { EDIT, REMOVE, COPY, END_EDITING_TRIGGER_CLASSNAME, withStyleOverrides } from '@instructure/quiz-common';
+import { EDIT, REMOVE, COPY, END_EDITING_TRIGGER_CLASSNAME } from '@instructure/quiz-common/constants';
+import { withStyleOverrides } from '@instructure/quiz-common/util/withStyleOverrides';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
 var ScrollTargetButton = makeScrollable(IconButton);
@@ -143,7 +144,7 @@ export var ActionButtons = /*#__PURE__*/ function(Component) {
                 if (this.shouldFocusOnMount() && this.editButton) {
                     // use setTimeout to break away from RCE destruction that loses focus
                     setTimeout(function() {
-                        _this.editButton && _this.editButton.getWrappedInstance().setFocus();
+                        _this.editButton && _this.editButton.setFocus();
                     }, 50);
                 }
                 this.props.makeStyles();