javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-15 17:42:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into chore-sync-next-main

Browse Source
This commit is contained in:
Brandy Carney
2024-08-30 13:35:59 -04:00
parent a0101bf3fb 95dd3364f2
commit 526f2b4a63
184 changed files with 14650 additions and 12348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/vue/src/ionic-vue.ts
View File

@ -21,7 +21,7 @@ const getHelperFunctions = () => {
};
};
export const IonicVue: Plugin = {
export const IonicVue: Plugin<[IonicConfig?]> = {
async install(_: App, config: IonicConfig = {}) {
/**
* By default Ionic Framework hides elements that

21
packages/vue/src/vue-component-lib/utils.ts
View File

@ -115,6 +115,16 @@ export const defineContainer = <Props, VModelType = string | number | boolean>(
if (routerLink === EMPTY_PROP) return;
if (navManager !== undefined) {
/**
* This prevents the browser from
* performing a page reload when pressing
* an Ionic component with routerLink.
* The page reload interferes with routing
* and causes ion-back-button to disappear
* since the local history is wiped on reload.
*/
ev.preventDefault();
let navigationPayload: any = { event: ev };
for (const key in props) {
const value = props[key];
@ -185,6 +195,17 @@ export const defineContainer = <Props, VModelType = string | number | boolean>(
}
}
// If router link is defined, add href to props
// in order to properly render an anchor tag inside
// of components that should become activatable and
// focusable with router link.
if (props[ROUTER_LINK_VALUE] !== EMPTY_PROP) {
propsToAdd = {
...propsToAdd,
href: props[ROUTER_LINK_VALUE],
};
}
/**
* vModelDirective is only needed on components that support v-model.
* As a result, we conditionally call withDirectives with v-model components.