Skip to content

Commit

Permalink
Merge pull request #318 from kiva/wwwHeader-integration-test
Browse files Browse the repository at this point in the history
fix: menu drawer was not visible
  • Loading branch information
christian14b authored Nov 20, 2023
2 parents 6d5059a + 22e3490 commit 4cd08df
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 797 deletions.
12 changes: 7 additions & 5 deletions @kiva/kv-components/vue/KvWwwHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
v-show="menuOpen || searchOpen"
class="
tw-absolute tw-z-modal
tw-top-7.5 tw-inset-x-0 tw-bottom-0
tw-top-7.5 tw-inset-x-0
tw-bg-eco-green-4
tw-bg-opacity-[50%]
"
Expand All @@ -100,6 +100,7 @@
ref="menuComponentInstance"
:logged-in="loggedIn"
:login-url="loginUrl"
:user-id="userId"
:balance="balance"
:is-borrower="isBorrower"
:is-trustee="isTrustee"
Expand All @@ -114,14 +115,13 @@

<script>
import {
ref,
ref, shallowRef,
} from 'vue-demi';
import {
ecoForestTheme,
} from '@kiva/kv-tokens/configs/kivaColors.cjs';
import KvHeaderLinkBar from './KvWwwHeader/KvHeaderLinkBar.vue';
import KvHeaderLogo from './KvWwwHeader/KvHeaderLogo.vue';
import KvHeaderMobileMenu from './KvWwwHeader/KvHeaderMobileMenu.vue';
import KvHeaderSearchBar from './KvWwwHeader/KvHeaderSearchBar.vue';
import KvThemeProvider from './KvThemeProvider.vue';
import KvHeaderSearchSuggestions from './KvWwwHeader/KvHeaderSearchSuggestions.vue';
Expand All @@ -130,7 +130,6 @@ export default {
components: {
KvHeaderLinkBar,
KvHeaderLogo,
KvHeaderMobileMenu,
KvHeaderSearchBar,
KvThemeProvider,
KvHeaderSearchSuggestions,
Expand Down Expand Up @@ -170,8 +169,9 @@ export default {
const searchOpen = ref(false);
const activeHeaderItem = ref(null);
const menuOpen = ref(false);
const menuComponent = ref(null);
const menuComponent = shallowRef(null);
const menuComponentInstance = ref(null);
const userId = ref(props.userId);
let menuCloseTimeout;
Expand Down Expand Up @@ -229,6 +229,7 @@ export default {
return {
ecoForestTheme,
userId,
afterLinksNotVisible,
afterSearchClosed,
Expand All @@ -248,6 +249,7 @@ export default {
activeHeaderItem,
searchBar,
menuComponent,
menuComponentInstance,
};
},
};
Expand Down
9 changes: 5 additions & 4 deletions @kiva/kv-components/vue/KvWwwHeader/KvHeaderLinkBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@

<script>
import {
defineAsyncComponent,
ref,
} from 'vue-demi';
import { mdiAccountCircle, mdiMenu } from '@mdi/js';
Expand All @@ -150,9 +151,9 @@ import KvIconChevron from '../KvIconChevron.vue';
import KvIconSearch from '../KvIconSearch.vue';
import KvMaterialIcon from '../KvMaterialIcon.vue';
const KvHeaderMobileMenu = () => import('./KvHeaderMobileMenu.vue');
const KvHeaderMyKivaMenu = () => import('./KvHeaderMyKivaMenu.vue');
const KvLendMenu = () => import('./LendMenu/KvLendMenu.vue');
const KvHeaderMobileMenu = defineAsyncComponent(() => import('./KvHeaderMobileMenu.vue'));
const KvHeaderMyKivaMenu = defineAsyncComponent(() => import('./KvHeaderMyKivaMenu.vue'));
const KvLendMenu = defineAsyncComponent(() => import('./LendMenu/KvLendMenu.vue'));
export default {
components: {
Expand All @@ -171,7 +172,7 @@ export default {
default: 0,
},
openMenuItem: {
type: [Element, Function],
type: [Object, Function],
default: null,
},
loginUrl: {
Expand Down
Loading

0 comments on commit 4cd08df

Please sign in to comment.