mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-16 01:52:19 +08:00

Issue number: resolves #28165 --------- <!-- Please do not submit updates to dependencies unless it fixes an issue. --> <!-- Please try to limit your pull request to one type (bugfix, feature, etc). Submit multiple pull requests if needed. --> ## What is the current behavior? <!-- Please describe the current behavior that you are modifying. --> The overlay implementation in Vue only checks for truthy `keepContentsMounted` values. When setting this prop as an attribute, the value of it is `''` which is falsy. As a result, content does not get mounted. One of Vue's ESLint rules states that this should be supported: https://eslint.vuejs.org/rules/prefer-true-attribute-shorthand.html Part of the issue may also be that Vue does not know the type of this property and so it assume "any": > The shorthand form is not always equivalent! If a prop accepts multiple types, but Boolean is not the first one, a shorthand prop won't pass true. ## What is the new behavior? <!-- Please describe the behavior or changes that are being added by this PR. --> - The overlay wrapper now checks for `''` values. If `keepContentsMounted === ''` then the inner contents will be mounted because this means the prop is being set using the attribute shorthand. ## Does this introduce a breaking change? - [ ] Yes - [x] No <!-- If this introduces a breaking change, please describe the impact and migration path for existing applications below. --> ## Other information <!-- Any other information that is important to this PR such as screenshots of how the component looks before and after the change. --> Dev build: `7.3.5-dev.11694621267.1e5f63c2`
211 lines
5.8 KiB
TypeScript
211 lines
5.8 KiB
TypeScript
import { defineComponent, h, ref, VNode, onMounted } from 'vue';
|
|
|
|
// TODO(FW-2969): types
|
|
|
|
export interface OverlayProps {
|
|
isOpen?: boolean;
|
|
}
|
|
|
|
const EMPTY_PROP = Symbol();
|
|
const DEFAULT_EMPTY_PROP = { default: EMPTY_PROP };
|
|
|
|
export const defineOverlayContainer = <Props extends object>(name: string, defineCustomElement: () => void, componentProps: string[] = [], hasDelegateHost?: boolean, controller?: any) => {
|
|
|
|
const createControllerComponent = () => {
|
|
return defineComponent<Props & OverlayProps>((props, { slots, emit }) => {
|
|
const eventListeners = [
|
|
{ componentEv: `${name}-will-present`, frameworkEv: 'willPresent' },
|
|
{ componentEv: `${name}-did-present`, frameworkEv: 'didPresent' },
|
|
{ componentEv: `${name}-will-dismiss`, frameworkEv: 'willDismiss' },
|
|
{ componentEv: `${name}-did-dismiss`, frameworkEv: 'didDismiss' },
|
|
];
|
|
|
|
if (defineCustomElement !== undefined) {
|
|
defineCustomElement();
|
|
}
|
|
|
|
const overlay = ref();
|
|
const onVnodeMounted = async () => {
|
|
const isOpen = props.isOpen;
|
|
isOpen && (await present(props))
|
|
}
|
|
|
|
const onVnodeUpdated = async (node: VNode, prevNode: VNode) => {
|
|
const isOpen = node.props!.isOpen;
|
|
const prevIsOpen = prevNode.props!.isOpen;
|
|
|
|
/**
|
|
* Do not do anything if this prop
|
|
* did not change.
|
|
*/
|
|
if (isOpen === prevIsOpen) return;
|
|
|
|
if (isOpen) {
|
|
await present(props);
|
|
} else {
|
|
await dismiss();
|
|
}
|
|
}
|
|
|
|
const onVnodeBeforeUnmount = async () => {
|
|
await dismiss();
|
|
}
|
|
|
|
const dismiss = async () => {
|
|
if (!overlay.value) return;
|
|
|
|
await overlay.value;
|
|
|
|
overlay.value = overlay.value.dismiss();
|
|
|
|
await overlay.value;
|
|
|
|
overlay.value = undefined;
|
|
}
|
|
|
|
const present = async (props: Readonly<Props>) => {
|
|
/**
|
|
* Do not open another instance
|
|
* if one is already opened.
|
|
*/
|
|
if (overlay.value) {
|
|
await overlay.value;
|
|
}
|
|
|
|
if (overlay.value?.present) {
|
|
await overlay.value.present();
|
|
return;
|
|
}
|
|
|
|
let restOfProps: any = {};
|
|
|
|
/**
|
|
* We can use Object.entries here
|
|
* to avoid the hasOwnProperty check,
|
|
* but that would require 2 iterations
|
|
* where as this only requires 1.
|
|
*/
|
|
for (const key in props) {
|
|
const value = props[key] as any;
|
|
if (props.hasOwnProperty(key) && value !== EMPTY_PROP) {
|
|
restOfProps[key] = value;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* These are getting passed as props.
|
|
* Potentially a Vue bug with Web Components?
|
|
*/
|
|
delete restOfProps.onWillPresent;
|
|
delete restOfProps.onDidPresent;
|
|
delete restOfProps.onWillDismiss;
|
|
delete restOfProps.onDidDismiss;
|
|
|
|
const component = slots.default && slots.default()[0];
|
|
overlay.value = controller.create({
|
|
...restOfProps,
|
|
component
|
|
});
|
|
|
|
overlay.value = await overlay.value;
|
|
|
|
eventListeners.forEach(eventListener => {
|
|
overlay.value.addEventListener(eventListener.componentEv, () => {
|
|
emit(eventListener.frameworkEv);
|
|
});
|
|
})
|
|
|
|
await overlay.value.present();
|
|
}
|
|
|
|
return () => {
|
|
return h(
|
|
'div',
|
|
{
|
|
style: { display: 'none' },
|
|
onVnodeMounted,
|
|
onVnodeUpdated,
|
|
onVnodeBeforeUnmount,
|
|
isOpen: props.isOpen === true
|
|
}
|
|
);
|
|
}
|
|
});
|
|
};
|
|
const createInlineComponent = () => {
|
|
return defineComponent((props, { slots }) => {
|
|
if (defineCustomElement !== undefined) {
|
|
defineCustomElement();
|
|
}
|
|
const isOpen = ref(false);
|
|
const elementRef = ref();
|
|
|
|
onMounted(() => {
|
|
elementRef.value.addEventListener('ion-mount', () => isOpen.value = true);
|
|
elementRef.value.addEventListener('will-present', () => isOpen.value = true);
|
|
elementRef.value.addEventListener('did-dismiss', () => isOpen.value = false);
|
|
});
|
|
|
|
return () => {
|
|
let restOfProps: any = {};
|
|
|
|
/**
|
|
* We can use Object.entries here
|
|
* to avoid the hasOwnProperty check,
|
|
* but that would require 2 iterations
|
|
* where as this only requires 1.
|
|
*/
|
|
for (const key in props) {
|
|
const value = (props as any)[key];
|
|
if (props.hasOwnProperty(key) && value !== EMPTY_PROP) {
|
|
restOfProps[key] = value;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Some overlays need a wrapper element so content
|
|
* takes up the full size of the parent overlay.
|
|
*/
|
|
const renderChildren = () => {
|
|
if (hasDelegateHost) {
|
|
return h('div', { className: 'ion-delegate-host ion-page' }, slots);
|
|
}
|
|
|
|
return slots;
|
|
}
|
|
|
|
return h(
|
|
name,
|
|
{ ...restOfProps, ref: elementRef },
|
|
|
|
/**
|
|
* When binding keepContentsMounted as an attribute
|
|
* i.e. <ion-modal keep-contents-mounted></ion-modal>
|
|
* the value of the prop will be the empty string which is
|
|
* why we still call renderChildren() in that case.
|
|
*/
|
|
(isOpen.value || restOfProps.keepContentsMounted || restOfProps.keepContentsMounted === '') ? renderChildren() : undefined
|
|
)
|
|
}
|
|
});
|
|
}
|
|
|
|
const Container = (controller !== undefined) ? createControllerComponent() : createInlineComponent();
|
|
|
|
Container.name = name;
|
|
|
|
Container.props = {
|
|
'isOpen': DEFAULT_EMPTY_PROP
|
|
};
|
|
|
|
componentProps.forEach(componentProp => {
|
|
Container.props[componentProp] = DEFAULT_EMPTY_PROP;
|
|
});
|
|
|
|
if (controller !== undefined) {
|
|
Container.emits = ['willPresent', 'didPresent', 'willDismiss', 'didDismiss'];
|
|
}
|
|
|
|
return Container;
|
|
}
|