@gitlab/ui 85.3.0 → 85.4.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [85.4.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v85.3.1...v85.4.0) (2024-06-26)
+
+
+### Features
+
+* **DuoChat:** update user feedback response ([5c51a3f](https://gitlab.com/gitlab-org/gitlab-ui/commit/5c51a3f8c8c2d04aef7507c3032c3992681a4682))
+
+## [85.3.1](https://gitlab.com/gitlab-org/gitlab-ui/compare/v85.3.0...v85.3.1) (2024-06-26)
+
+
+### Bug Fixes
+
+* **bootstrap-vue:** Revert IE11 specific modal fix ([d1cca1b](https://gitlab.com/gitlab-org/gitlab-ui/commit/d1cca1b02d7ac6f9dc7a66f0bda85f1c5d279b69)), closes [/gitlab.com/gitlab-org/gitlab/-/merge_requests/140612#note_1911015817](https://gitlab.com//gitlab.com/gitlab-org/gitlab/-/merge_requests/140612/issues/note_1911015817)
+
 # [85.3.0](https://gitlab.com/gitlab-org/gitlab-ui/compare/v85.2.2...v85.3.0) (2024-06-26)
 
 

package/dist/components/experimental/duo/user_feedback/user_feedback.js

@@ -1,3 +1,4 @@
+import GlAlert from '../../../base/alert/alert';
 import GlButton from '../../../base/button/button';
 import FeedbackModal from './user_feedback_modal';
 import __vue_normalize__ from 'vue-runtime-helpers/dist/normalize-component.js';
@@ -9,6 +10,7 @@ const i18n = {
 var script = {
   name: 'GlDuoUserFeedback',
   components: {
+    GlAlert,
     GlButton,
     FeedbackModal
   },
@@ -60,7 +62,7 @@ var script = {
 const __vue_script__ = script;
 
 /* template */
-var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"gl-pt-4"},[_c('div',[(!_vm.feedbackReceived)?_c('gl-button',{attrs:{"variant":"link","target":"_blank","href":_vm.feedbackLinkUrl,"button-text-classes":"gl-white-space-normal! gl-text-left"},on:{"click":function($event){_vm.shouldRenderModal && _vm.$refs.feedbackModal.show();}}},[_vm._v(_vm._s(_vm.feedbackLinkText))]):_c('span',{staticClass:"gl-text-gray-500"},[_vm._v("\n      "+_vm._s(_vm.$options.i18n.FEEDBACK_THANKS)+"\n    ")])],1),_vm._v(" "),(_vm.shouldRenderModal)?_c('feedback-modal',{ref:"feedbackModal",on:{"feedback-submitted":_vm.notify},scopedSlots:_vm._u([{key:"feedback-extra-fields",fn:function(){return [_vm._t("feedback-extra-fields")]},proxy:true}],null,true)}):_vm._e()],1)};
+var __vue_render__ = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"gl-pt-4 gl-w-full"},[_c('div',[(!_vm.feedbackReceived)?_c('gl-button',{attrs:{"variant":"link","target":"_blank","href":_vm.feedbackLinkUrl,"button-text-classes":"gl-white-space-normal! gl-text-left"},on:{"click":function($event){_vm.shouldRenderModal && _vm.$refs.feedbackModal.show();}}},[_vm._v(_vm._s(_vm.feedbackLinkText))]):_c('gl-alert',{attrs:{"variant":"success","dismissible":false}},[_vm._v("\n      "+_vm._s(_vm.$options.i18n.FEEDBACK_THANKS)+"\n    ")])],1),_vm._v(" "),(_vm.shouldRenderModal)?_c('feedback-modal',{ref:"feedbackModal",on:{"feedback-submitted":_vm.notify},scopedSlots:_vm._u([{key:"feedback-extra-fields",fn:function(){return [_vm._t("feedback-extra-fields")]},proxy:true}],null,true)}):_vm._e()],1)};
 var __vue_staticRenderFns__ = [];
 
   /* style */

package/dist/vendor/bootstrap-vue/src/components/modal/modal.js

@@ -191,17 +191,15 @@ const BModal = /*#__PURE__*/extend({
     modalClasses() {
       return [{
         fade: !this.noFade,
-        show: this.isShow
+        show: this.isShow,
+        'd-block': this.isBlock
       }, this.modalClass];
     },
     modalStyles() {
       const sbWidth = `${this.scrollbarWidth}px`;
       return {
         paddingLeft: !this.isBodyOverflowing && this.isModalOverflowing ? sbWidth : '',
-        paddingRight: this.isBodyOverflowing && !this.isModalOverflowing ? sbWidth : '',
-        // Needed to fix issue https://github.com/bootstrap-vue/bootstrap-vue/issues/3457
-        // Even though we are using v-show, we must ensure 'none' is restored in the styles
-        display: this.isBlock ? 'block' : 'none'
+        paddingRight: this.isBodyOverflowing && !this.isModalOverflowing ? sbWidth : ''
       };
     },
     dialogClasses() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitlab/ui",
-  "version": "85.3.0",
+  "version": "85.4.0",
   "description": "GitLab UI Components",
   "license": "MIT",
   "main": "dist/index.js",

package/src/components/experimental/duo/user_feedback/user_feedback.vue

@@ -1,4 +1,5 @@
 <script>
+import GlAlert from '../../../base/alert/alert.vue';
 import GlButton from '../../../base/button/button.vue';
 import FeedbackModal from './user_feedback_modal.vue';
 
@@ -10,6 +11,7 @@ export const i18n = {
 export default {
   name: 'GlDuoUserFeedback',
   components: {
+    GlAlert,
     GlButton,
     FeedbackModal,
   },
@@ -59,7 +61,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-pt-4">
+  <div class="gl-pt-4 gl-w-full">
     <div>
       <gl-button
         v-if="!feedbackReceived"
@@ -70,9 +72,9 @@ export default {
         @click="shouldRenderModal && $refs.feedbackModal.show()"
         >{{ feedbackLinkText }}</gl-button
       >
-      <span v-else class="gl-text-gray-500">
+      <gl-alert v-else variant="success" :dismissible="false">
         {{ $options.i18n.FEEDBACK_THANKS }}
-      </span>
+      </gl-alert>
     </div>
     <feedback-modal v-if="shouldRenderModal" ref="feedbackModal" @feedback-submitted="notify">
       <template #feedback-extra-fields>

package/src/vendor/bootstrap-vue/src/components/modal/modal.js

@@ -237,7 +237,8 @@ export const BModal = /*#__PURE__*/ extend({
       return [
         {
           fade: !this.noFade,
-          show: this.isShow
+          show: this.isShow,
+          'd-block': this.isBlock
         },
         this.modalClass
       ]
@@ -246,10 +247,7 @@ export const BModal = /*#__PURE__*/ extend({
       const sbWidth = `${this.scrollbarWidth}px`
       return {
         paddingLeft: !this.isBodyOverflowing && this.isModalOverflowing ? sbWidth : '',
-        paddingRight: this.isBodyOverflowing && !this.isModalOverflowing ? sbWidth : '',
-        // Needed to fix issue https://github.com/bootstrap-vue/bootstrap-vue/issues/3457
-        // Even though we are using v-show, we must ensure 'none' is restored in the styles
-        display: this.isBlock ? 'block' : 'none'
+        paddingRight: this.isBodyOverflowing && !this.isModalOverflowing ? sbWidth : ''
       }
     },
     dialogClasses() {

package/src/vendor/bootstrap-vue/src/components/modal/modal.spec.js

@@ -138,7 +138,7 @@ describe('modal', () => {
       expect($modal.attributes('aria-modal')).toBeDefined()
       expect($modal.attributes('aria-modal')).toEqual('true')
       expect($modal.classes()).toContain('modal')
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       // Should have a backdrop
       const $backdrop = wrapper.find('div.modal-backdrop')
@@ -220,7 +220,7 @@ describe('modal', () => {
       expect($modal.attributes('aria-hidden')).toBeUndefined()
       expect($modal.attributes('aria-modal')).toBeDefined()
       expect($modal.attributes('aria-modal')).toEqual('true')
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       // Should have a backdrop
       const $backdrop = wrapper.find('div.modal-backdrop')
@@ -459,7 +459,7 @@ describe('modal', () => {
       const $modal = wrapper.find('div.modal')
       expect($modal.exists()).toBe(true)
 
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       const $buttons = wrapper.findAll('header button')
       expect($buttons.length).toBe(1)
@@ -485,7 +485,7 @@ describe('modal', () => {
       await waitRAF()
 
       // Modal should still be open
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       // Try and close modal (and not prevent it)
       cancelHide = false
@@ -536,7 +536,7 @@ describe('modal', () => {
       const $modal = wrapper.find('div.modal')
       expect($modal.exists()).toBe(true)
 
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       const $buttons = wrapper.findAll('footer button')
       expect($buttons.length).toBe(2)
@@ -562,7 +562,7 @@ describe('modal', () => {
       await waitRAF()
 
       // Modal should still be open
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       // Try and close modal (and not prevent it)
       cancelHide = false
@@ -616,7 +616,7 @@ describe('modal', () => {
       const $modal = wrapper.find('div.modal')
       expect($modal.exists()).toBe(true)
 
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       expect(wrapper.emitted('hide')).toBeUndefined()
       expect(trigger).toEqual(null)
@@ -672,7 +672,7 @@ describe('modal', () => {
       const $modal = wrapper.find('div.modal')
       expect($modal.exists()).toBe(true)
 
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       expect(wrapper.emitted('hide')).toBeUndefined()
       expect(trigger).toEqual(null)
@@ -736,7 +736,7 @@ describe('modal', () => {
       const $footer = wrapper.find('footer.modal-footer')
       expect($footer.exists()).toBe(true)
 
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       expect(wrapper.emitted('hide')).toBeUndefined()
       expect(trigger).toEqual(null)
@@ -752,7 +752,7 @@ describe('modal', () => {
       expect(trigger).toEqual(null)
 
       // Modal should not be closed
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       // Try and close modal via a "dragged" click out
       // starting from inside modal and finishing on backdrop
@@ -765,7 +765,7 @@ describe('modal', () => {
       expect(trigger).toEqual(null)
 
       // Modal should not be closed
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       // Try and close modal via click out
       await $modal.trigger('click')
@@ -811,7 +811,7 @@ describe('modal', () => {
       await waitRAF()
 
       // Modal should now be open
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       // Try and close modal via `bv::hide::modal`
       wrapper.vm.$root.$emit('bv::hide::modal', 'test')
@@ -858,7 +858,7 @@ describe('modal', () => {
       await waitRAF()
 
       // Modal should now be open
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       // Try and close modal via `bv::toggle::modal`
       wrapper.vm.$root.$emit('bv::toggle::modal', 'test')
@@ -879,7 +879,7 @@ describe('modal', () => {
       await waitNT(wrapper.vm)
       await waitRAF()
 
-      // Modal should not be open
+      // Modal should now be open
       expect($modal.element.style.display).toEqual('none')
 
       wrapper.destroy()
@@ -947,7 +947,7 @@ describe('modal', () => {
 
       // Modal should now be open
       expect(called).toBe(true)
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       wrapper.destroy()
     })
@@ -983,7 +983,7 @@ describe('modal', () => {
       await waitRAF()
 
       // Modal should now be open
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       // Try and close modal via `.toggle()` method
       wrapper.vm.toggle()
@@ -1020,7 +1020,7 @@ describe('modal', () => {
       const $modal = wrapper.find('div.modal')
       expect($modal.exists()).toBe(true)
 
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
 
       // Simulate an other modal opening (by emitting a fake BvEvent)
       // `bvEvent.vueTarget` is normally a Vue instance, but in this
@@ -1089,7 +1089,7 @@ describe('modal', () => {
       await waitRAF()
 
       // Modal should now be open
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
       expect(document.activeElement).not.toBe(document.body)
       expect(document.activeElement).not.toBe($button.element)
       expect($modal.element.contains(document.activeElement)).toBe(true)
@@ -1173,7 +1173,7 @@ describe('modal', () => {
       await waitRAF()
 
       // Modal should now be open
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
       expect(document.activeElement).not.toBe(document.body)
       expect(document.activeElement).not.toBe($button.element)
       expect(document.activeElement).not.toBe($button2.element)
@@ -1231,7 +1231,7 @@ describe('modal', () => {
       const $content = $modal.find('div.modal-content')
       expect($content.exists()).toBe(true)
 
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
       expect(document.activeElement).not.toBe(document.body)
       expect(document.activeElement).toBe($content.element)
 
@@ -1328,7 +1328,7 @@ describe('modal', () => {
       const $content = $modal.find('div.modal-content')
       expect($content.exists()).toBe(true)
 
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
       expect(document.activeElement).not.toBe(document.body)
       expect(document.activeElement).toBe($content.element)
 
@@ -1396,7 +1396,7 @@ describe('modal', () => {
       const $content = $modal.find('div.modal-content')
       expect($content.exists()).toBe(true)
 
-      expect($modal.element.style.display).toEqual('block')
+      expect($modal.element.style.display).toEqual('')
       expect(document.activeElement).not.toBe(document.body)
       expect(document.activeElement).toBe($content.element)