Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Tencent/omi
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v7.1.5
Choose a base ref
...
head repository: Tencent/omi
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6db18f138d1cb1ab0a3bddfc53e76469998f4fc5
Choose a head ref

There isn’t anything to compare.

v7.1.5 and 6db18f138d1cb1ab0a3bddfc53e76469998f4fc5 are entirely different commit histories.

Showing with 9 additions and 16 deletions.
  1. +2 −2 packages/omi/omi.d.ts
  2. +1 −1 packages/omi/package.json
  3. +5 −12 packages/omi/src/component.ts
  4. +1 −1 packages/omi/src/index.ts
4 changes: 2 additions & 2 deletions packages/omi/omi.d.ts
Original file line number Diff line number Diff line change
@@ -66,9 +66,9 @@ declare namespace Omi {
installed?(): void;
uninstall?(): void;
beforeUpdate?(): void;
afterUpdate?(): void;
updated?(): void;
beforeRender?(): void;
rendered?(vnode: VNode | VNode[]): void;
receiveProps?(props: OmiProps<P> | P, oldProps: OmiProps<P> | P): any;
attrsToProps(): void;
setAttribute(name: string, value: any): void;
@@ -80,9 +80,9 @@ declare namespace Omi {
installed?(): void;
uninstall?(): void;
beforeUpdate?(): void;
afterUpdate?(): void;
updated?(): void;
beforeRender?(): void;
rendered?(vnode: VNode | VNode[]): void;
receiveProps?(props: OmiProps<P> | P, oldProps: OmiProps<P> | P): any;
attrsToProps(): void;
setAttribute(name: string, value: any): void;
2 changes: 1 addition & 1 deletion packages/omi/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "omi",
"version": "7.1.5",
"version": "7.1.6",
"scripts": {
"start": "vite",
"dev-vite": "vite",
17 changes: 5 additions & 12 deletions packages/omi/src/component.ts
Original file line number Diff line number Diff line change
@@ -140,20 +140,17 @@ export class Component extends HTMLElement {
connectedCallback(): void {
this.injectObject()
this.attrsToProps()
this.beforeInstall()
this.install()
this.afterInstall()
this.renderRoot = this.createRenderRoot()
this.applyAdoptedStyleSheets()
this.beforeRender()
setActiveComponent(this)
this.beforeRender()
// @ts-ignore
const rendered = this.render(this.props, this.store)
this.appendStyleVNode(rendered)
this.rendered(rendered)
setActiveComponent(null)
this.rootElement = diff(null, rendered as VNode, null, this, false)
this.rendered()


if (isArray(this.rootElement)) {
(this.rootElement as Element[]).forEach((item) => {
@@ -169,14 +166,14 @@ export class Component extends HTMLElement {

update(updateSelf?: boolean): void {
this.beforeUpdate()
this.beforeRender()
this.attrsToProps()
setActiveComponent(this)
this.beforeRender()
// @ts-ignore
const rendered = this.render(this.props, this.store)
this.appendStyleVNode(rendered)
this.rendered(rendered)
setActiveComponent(null)
this.rendered()

this.rootElement = diff(
this.rootElement,
@@ -292,12 +289,8 @@ export class Component extends HTMLElement {
}
}

beforeInstall() { }

install() { }

afterInstall() { }

installed() { }

uninstall() { }
@@ -308,7 +301,7 @@ export class Component extends HTMLElement {

beforeRender() { }

rendered() { }
rendered(vnode: VNode | VNode[]) { }

receiveProps() { }
}
2 changes: 1 addition & 1 deletion packages/omi/src/index.ts
Original file line number Diff line number Diff line change
@@ -7,6 +7,6 @@ export { createRef, bind } from './utils'
export { signal, computed, effect, batch, setActiveComponent, getActiveComponent } from './reactivity'
export { Signal } from './signal'
export { css } from './css-tag'
export const version = '7.1.5'
export const version = '7.1.6'