@gitlab/ui 97.2.1 → 98.0.0

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

@@ -46,32 +46,6 @@ describe('collapse', () => {
     expect(wrapper.attributes('id')).toBeDefined()
     expect(wrapper.attributes('id')).toEqual('test')
     expect(wrapper.classes()).toContain('collapse')
-    expect(wrapper.classes()).not.toContain('navbar-collapse')
-    expect(wrapper.classes()).not.toContain('show')
-    expect(wrapper.element.style.display).toEqual('none')
-    expect(wrapper.text()).toEqual('')
-
-    wrapper.destroy()
-  })
-
-  it('should have expected structure when prop is-nav is set', async () => {
-    const wrapper = mount(BCollapse, {
-      attachTo: document.body,
-      propsData: {
-        // 'id' is a required prop
-        id: 'test',
-        isNav: true
-      }
-    })
-    // const rootWrapper = createWrapper(wrapper.vm.$root)
-    expect(wrapper.vm).toBeDefined()
-    await waitNT(wrapper.vm)
-    await waitRAF()
-    expect(wrapper.element.tagName).toBe('DIV')
-    expect(wrapper.attributes('id')).toBeDefined()
-    expect(wrapper.attributes('id')).toEqual('test')
-    expect(wrapper.classes()).toContain('collapse')
-    expect(wrapper.classes()).toContain('navbar-collapse')
     expect(wrapper.classes()).not.toContain('show')
     expect(wrapper.element.style.display).toEqual('none')
     expect(wrapper.text()).toEqual('')
@@ -369,112 +343,6 @@ describe('collapse', () => {
     wrapper.destroy()
   })
 
-  it('should close when clicking on contained nav-link prop is-nav is set', async () => {
-    const App = {
-      render(h) {
-        return h('div', [
-          // JSDOM supports `getComputedStyle()` when using stylesheets (non responsive)
-          // https://github.com/jsdom/jsdom/blob/master/Changelog.md#030
-          h('style', { attrs: { type: 'text/css' } }, '.collapse:not(.show) { display: none; }'),
-          h(
-            BCollapse,
-            {
-              props: {
-                id: 'test',
-                isNav: true,
-                visible: true
-              }
-            },
-            [h('a', { class: 'nav-link', attrs: { href: '#' } }, 'nav link')]
-          )
-        ])
-      }
-    }
-    const wrapper = mount(App, {
-      attachTo: document.body
-    })
-
-    expect(wrapper.vm).toBeDefined()
-    const $collapse = wrapper.findComponent(BCollapse)
-    expect($collapse.vm).toBeDefined()
-
-    expect(wrapper.find('style').exists()).toBe(true)
-
-    await waitNT(wrapper.vm)
-    await waitRAF()
-    await waitNT(wrapper.vm)
-    await waitRAF()
-
-    expect($collapse.classes()).toContain('show')
-    expect($collapse.element.style.display).toEqual('')
-    expect($collapse.find('.nav-link').exists()).toBe(true)
-
-    // Click on link
-    await wrapper.find('.nav-link').trigger('click')
-    await waitRAF()
-    await waitRAF()
-    expect($collapse.classes()).not.toContain('show')
-    expect($collapse.element.style.display).toEqual('none')
-
-    wrapper.destroy()
-  })
-
-  it('should not close when clicking on nav-link prop is-nav is set & collapse is display block important', async () => {
-    const App = {
-      render(h) {
-        return h('div', [
-          // JSDOM supports `getComputedStyle()` when using stylesheets (non responsive)
-          // Although it appears to be picky about CSS definition ordering
-          // https://github.com/jsdom/jsdom/blob/master/Changelog.md#030
-          h(
-            'style',
-            { attrs: { type: 'text/css' } },
-            '.collapse:not(.show) { display: none; } .d-block { display: block !important; }'
-          ),
-          h(
-            BCollapse,
-            {
-              class: 'd-block',
-              props: {
-                id: 'test',
-                isNav: true,
-                visible: true
-              }
-            },
-            [h('a', { class: 'nav-link', attrs: { href: '#' } }, 'nav link')]
-          )
-        ])
-      }
-    }
-    const wrapper = mount(App, {
-      attachTo: document.body
-    })
-
-    expect(wrapper.vm).toBeDefined()
-    const $collapse = wrapper.findComponent(BCollapse)
-    expect($collapse.vm).toBeDefined()
-
-    expect(wrapper.find('style').exists()).toBe(true)
-
-    await waitNT(wrapper.vm)
-    await waitRAF()
-    await waitNT(wrapper.vm)
-    await waitRAF()
-
-    expect($collapse.classes()).toContain('show')
-    expect($collapse.element.style.display).toEqual('')
-    expect($collapse.find('.nav-link').exists()).toBe(true)
-
-    // Click on link
-    await wrapper.find('.nav-link').trigger('click')
-    await waitRAF()
-    await waitRAF()
-    expect($collapse.classes()).toContain('show')
-    expect($collapse.element.style.display).toEqual('')
-
-    wrapper.destroy()
-  })
-
   it('should not respond to root toggle event that does not match ID', async () => {
     const wrapper = mount(BCollapse, {
       attachTo: document.body,

package/src/vendor/bootstrap-vue/src/components/collapse/package.json

@@ -20,10 +20,6 @@
             "version": "2.2.0",
             "description": "When set, and prop 'visible' is true on mount, will animate on initial mount"
           },
-          {
-            "prop": "isNav",
-            "description": "When set, signifies that the collapse is part of a navbar, enabling certain features for navbar support"
-          },
           {
             "prop": "visible",
             "description": "When 'true', expands the collapse"

package/src/vendor/bootstrap-vue/src/components/dropdown/README.md

@@ -723,7 +723,7 @@ the dropdown menu, ensure they are wrapped with a plain `<li>`.
 ## See also
 
 - [`<b-nav-item-dropdown>`](?path=/docs/base-nav--docs#dropdown-support) for dropdown support inside
-  `<b-nav>` and `<n-navbar>`
+  `<b-nav>`
 - [Router Link Support](?path=/docs/base-link--docs#router-link-support) reference for information
   about router-link specific props available on `<b-dropdown-item>`
 

package/src/vendor/bootstrap-vue/src/components/form-input/form-input.spec.js

@@ -927,6 +927,8 @@ describe('form-input', () => {
     const origGetBCR = Element.prototype.getBoundingClientRect
 
     beforeEach(() => {
+      // @gitlab-ui: In order to get these tests passing we needed to use real timers
+      jest.useRealTimers()
       // Mock `getBoundingClientRect()` so that the `isVisible(el)` test returns `true`
       Element.prototype.getBoundingClientRect = jest.fn(() => ({
         width: 24,
@@ -941,6 +943,7 @@ describe('form-input', () => {
     afterEach(() => {
       // Restore prototype
       Element.prototype.getBoundingClientRect = origGetBCR
+      jest.useFakeTimers()
     })
 
     it('works when true', async () => {

package/src/vendor/bootstrap-vue/src/components/index.d.ts

@@ -22,7 +22,6 @@ export * from './layout'
 export * from './link'
 export * from './modal'
 export * from './nav'
-export * from './navbar'
 export * from './popover'
 export * from './table'
 export * from './tabs'

package/src/vendor/bootstrap-vue/src/components/index.scss

@@ -5,7 +5,6 @@
 @import "input-group/index";
 @import "modal/index";
 @import "nav/index";
-@import "navbar/index";
 @import "popover/index";
 @import "table/index";
 @import "toast/index";

package/src/vendor/bootstrap-vue/src/components/modal/MODIFICATIONS.md

@@ -1,11 +1,14 @@
 # Modifications to Vendored Code
 
 **Library**: BootstrapVue  
-**Version**: 2.23.1
+**Version**: 2.23.1 **Link:** https://bootstrap-vue.org **Source:**
+https://github.com/bootstrap-vue/bootstrap-vue **Copyright:** (c) 2016-2024 BootstrapVue
+**License:** (c)
+[2016-2024 BootstrapVue](https://github.com/bootstrap-vue/bootstrap-vue/blob/master/LICENSE)
 
 This file documents modifications made to the original BootstrapVue component files.
 
-## Removed unnecessary properties 
+## Removed unnecessary properties
 
 The following properties have been removed as they are no longer supported in our implementation:
 
@@ -19,9 +22,9 @@ The following properties have been removed as they are no longer supported in ou
 - `footerBorderVariant`
 - `footerTextVariant`
 
-These properties were removed to streamline the component for our use case, as they are no longer necessary in our project.
-The following files have been modified from the original:
+These properties were removed to streamline the component for our use case, as they are no longer
+necessary in our project. The following files have been modified from the original:
 
 - `modal.js`: Removed unnecessary properties.
 - `package.json`: Removed unnecessary properties.
-- `README.md`: Removed unnecessary properties.
+- `README.md`: Removed unnecessary properties.

package/src/vendor/bootstrap-vue/src/components/nav/package.json

@@ -79,7 +79,7 @@
           {
             "prop": "boundary",
             "version": "2.4.0",
-            "description": "The boundary constraint of the menu: 'scrollParent', 'window', 'viewport', or a reference to an HTMLElement. Has no effect when dropdown is inside a `<b-navbar>`"
+            "description": "The boundary constraint of the menu: 'scrollParent', 'window', 'viewport', or a reference to an HTMLElement."
           },
           {
             "prop": "dropleft",

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

@@ -129,7 +129,6 @@ describe('b-popover', () => {
   })
 
   it('initially open has expected structure', async () => {
-    jest.useFakeTimers()
     const wrapper = mount(App, {
       attachTo: document.body,
       propsData: {

package/src/vendor/bootstrap-vue/src/components/table/table-filtering.spec.js

@@ -371,7 +371,7 @@ describe('table > filtering', () => {
       lastFilterTimer = wrapper.vm.$_filterTimer
       expect(wrapper.vm.localFilter).not.toEqual('z')
 
-      jest.runTimersToTime(101)
+      jest.advanceTimersByTime(101)
       await waitNT(wrapper.vm)
       expect(wrapper.emitted('input').length).toBe(2)
       expect(wrapper.emitted('input')[1][0]).toEqual([testItems[2]])

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

@@ -187,7 +187,7 @@ const BVTabButton = /*#__PURE__*/ extend({
 
 // --- Props ---
 
-const navProps = omit(BNavProps, ['tabs', 'isNavBar', 'cardHeader'])
+const navProps = omit(BNavProps, ['tabs', 'cardHeader'])
 
 export const props = makePropsConfigurable(
   sortKeys({

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

@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import { waitNT, waitRAF } from '../../../tests/utils'
+import { ensureEventEmitted, waitNT, waitRAF } from '../../../tests/utils'
 import { BToast } from './toast'
 
 describe('b-toast', () => {
@@ -217,14 +217,14 @@ describe('b-toast', () => {
   })
 
   it('auto-hide works', async () => {
-    jest.useFakeTimers()
     const wrapper = mount(BToast, {
       attachTo: document.body,
       propsData: {
         static: true,
         noAutoHide: false,
         visible: true,
-        title: 'title'
+        title: 'title',
+        autoHideDelay: 1000
       },
       slots: {
         default: 'content'
@@ -232,10 +232,7 @@ describe('b-toast', () => {
     })
 
     expect(wrapper.vm).toBeDefined()
-    await waitNT(wrapper.vm)
-    await waitRAF()
-    await waitNT(wrapper.vm)
-    await waitRAF()
+
     await waitNT(wrapper.vm)
     await waitRAF()
     await waitNT(wrapper.vm)
@@ -244,19 +241,10 @@ describe('b-toast', () => {
     expect(wrapper.element.tagName).toBe('DIV')
     expect(wrapper.vm.$_dismissTimer).not.toEqual(null)
 
-    jest.runOnlyPendingTimers()
-
-    await waitNT(wrapper.vm)
-    await waitRAF()
-    await waitNT(wrapper.vm)
-    await waitRAF()
-    await waitNT(wrapper.vm)
-    await waitRAF()
-    await waitNT(wrapper.vm)
-    await waitRAF()
+    await ensureEventEmitted(wrapper, 'hidden')
 
-    expect(wrapper.element.nodeType).toBe(Node.COMMENT_NODE)
     expect(wrapper.vm.$_dismissTimer).toBe(null)
+    expect(wrapper.element.nodeType).toBe(Node.COMMENT_NODE)
 
     wrapper.destroy()
   })