Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(vue-next): compatible vue2 component tag name format #3793

Merged
merged 1 commit into from
Mar 26, 2024
Merged

feat(vue-next): compatible vue2 component tag name format #3793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 74 additions & 4 deletions driver/js/packages/hippy-vue-next/__test__/runtime/element/hippy-element.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,8 @@ describe('runtime/element/hippy-element', () => {
registerElement('p', p);
const element = new HippyElement('p');
element.isNeedInsertToNative = false;
expect(element.convertToNativeNodes(false)).toEqual([]);
const [nativeNode] = element.convertToNativeNodes(false);
expect(nativeNode).toEqual([]);
});

it('registered tag should return correct native node', () => {
Expand All @@ -547,10 +548,9 @@ describe('runtime/element/hippy-element', () => {
const element = new HippyElement('span');
const childElement = new HippyElement('span');
element.appendChild(childElement);
const [nativeNode] = element.convertToNativeNodes(false);
const [[[nativeNode]]] = element.convertToNativeNodes(false);
expect(nativeNode).toEqual(expect.objectContaining({
pId: 1,
index: 0,
name: 'Text',
id: 62,
props: {
Expand All @@ -565,7 +565,77 @@ describe('runtime/element/hippy-element', () => {
tagName: 'span',
}));
const nativeNodeList = element.convertToNativeNodes(true);
expect(nativeNodeList.length).toEqual(2);
expect(nativeNodeList.length).toEqual(3);
});
it('registered camelize custom tag should return correct native node', () => {
// custom component
const customElement: ElementComponent = {
component: {
name: 'Text',
attributeMaps: {},
eventNamesMap: new Map(),
defaultNativeProps: {
text: '',
},
},
};
registerElement('CustomTag', customElement);
const element = new HippyElement('custom-tag');
const childElement = new HippyElement('custom-tag');
element.appendChild(childElement);
const [[[nativeNode]]] = element.convertToNativeNodes(false);
expect(nativeNode).toEqual(expect.objectContaining({
pId: 1,
name: 'Text',
id: 64,
props: {
text: '',
style: {},
attributes: {
id: '',
class: '',
hippyNodeId: '64',
},
},
tagName: 'custom-tag',
}));
const nativeNodeList = element.convertToNativeNodes(true);
expect(nativeNodeList.length).toEqual(3);
});
it('registered hyphenate custom tag should return correct native node', () => {
// custom component
const customElement: ElementComponent = {
component: {
name: 'Text',
attributeMaps: {},
eventNamesMap: new Map(),
defaultNativeProps: {
text: '',
},
},
};
registerElement('Custom-Tag', customElement);
const element = new HippyElement('custom-tag');
const childElement = new HippyElement('custom-tag');
element.appendChild(childElement);
const [[[nativeNode]]] = element.convertToNativeNodes(false);
expect(nativeNode).toEqual(expect.objectContaining({
pId: 1,
name: 'Text',
id: 66,
props: {
text: '',
style: {},
attributes: {
id: '',
class: '',
hippyNodeId: '66',
},
},
tagName: 'custom-tag',
}));
const nativeNodeList = element.convertToNativeNodes(true);
expect(nativeNodeList.length).toEqual(3);
});
});

Expand Down
9 changes: 8 additions & 1 deletion driver/js/packages/hippy-vue-next/src/runtime/component/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
* TODO Is it better to obtain component information in the node or where it is used?
*
*/
import { camelize } from '@vue/shared'
import type { NeedToTyped, NativeNodeProps } from '../../types';
import { normalizeTagName } from '../../util';
import type { EventsUnionType, HippyEvent } from '../event/hippy-event';
Expand Down Expand Up @@ -92,5 +93,11 @@ export function registerElement(
export function getTagComponent(tagName: string): TagComponent {
// normalize tag name
const normalizedTagName = normalizeTagName(tagName);
return tagMap.get(normalizedTagName);
// lowerCase camelize tag name, compatible vue2 component tag name
const lowerCamelizedTagName = camelize(tagName).toLowerCase()
// first, get normal tag name. second get lower camelized name
// eg. register hippy custom element: registerElement('CustomTag', xxx).
// vue tepmlate: vue2 <custom-tag> -> customtag, vue3 <custom-tag> -> custom-tag
// so we compatible tag name at here
return tagMap.get(normalizedTagName) || tagMap.get(lowerCamelizedTagName);
}
Loading