tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat:web support size constraints

Browse Source
This commit is contained in:
wangxiangyuan 2023-09-04 12:06:26 +08:00 committed by osborn
parent e1c7d57cbb
commit 880afa050a
4 changed files with 93 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
doric-web/dist/index.js vendored
View File

@ -6255,7 +6255,11 @@ var doric_web = (function (exports, axios, sandbox) {
right: 0,
top: 0,
bottom: 0
}
},
maxWidth: -1,
maxHeight: -1,
minWidth: -1,
minHeight: -1
};
this.padding = {
left: 0,
@ -6337,6 +6341,32 @@ var doric_web = (function (exports, axios, sandbox) {
}
this.applyCSSStyle({ width });
}
configSizeConstraints() {
if (this.layoutConfig.maxWidth && this.layoutConfig.maxWidth !== -1) {
this.applyCSSStyle({ maxWidth: toPixelString(this.layoutConfig.maxWidth) });
}
else {
this.view.style.removeProperty('max-width');
}
if (this.layoutConfig.maxHeight && this.layoutConfig.maxHeight !== -1) {
this.applyCSSStyle({ maxHeight: toPixelString(this.layoutConfig.maxHeight) });
}
else {
this.view.style.removeProperty('max-height');
}
if (this.layoutConfig.minWidth && this.layoutConfig.minWidth !== -1) {
this.applyCSSStyle({ minWidth: toPixelString(this.layoutConfig.minWidth) });
}
else {
this.view.style.removeProperty('min-width');
}
if (this.layoutConfig.minHeight && this.layoutConfig.minHeight !== -1) {
this.applyCSSStyle({ minHeight: toPixelString(this.layoutConfig.minHeight) });
}
else {
this.view.style.removeProperty('min-height');
}
}
configHeight() {
let height;
switch (this.layoutConfig.heightSpec) {
@ -6381,6 +6411,7 @@ var doric_web = (function (exports, axios, sandbox) {
this.configPadding();
this.configWidth();
this.configHeight();
this.configSizeConstraints();
}
blendProps(v, propName, prop) {
switch (propName) {
@ -7237,6 +7268,22 @@ var doric_web = (function (exports, axios, sandbox) {
case "maxLines":
this.maxLines = prop;
break;
case "maxWidth":
if (prop) {
this.layoutConfig.maxWidth = prop;
}
else {
this.layoutConfig.maxWidth = -1;
}
break;
case "maxHeight":
if (prop) {
this.layoutConfig.maxHeight = prop;
}
else {
this.layoutConfig.maxHeight = -1;
}
break;
default:
super.blendProps(v, propName, prop);
break;

2
doric-web/dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

14
doric-web/src/shader/DoricTextNode.ts
View File

@ -69,6 +69,20 @@ export class DoricTextNode extends DoricViewNode {
case "maxLines":
this.maxLines = prop as number
break
case "maxWidth":
if (prop) {
this.layoutConfig.maxWidth = prop
} else {
this.layoutConfig.maxWidth = -1
}
break
case "maxHeight":
if (prop) {
this.layoutConfig.maxHeight = prop
} else {
this.layoutConfig.maxHeight = -1
}
break
default:
super.blendProps(v, propName, prop)
break

31
doric-web/src/shader/DoricViewNode.ts
View File

@ -64,8 +64,13 @@ export abstract class DoricViewNode {
right: 0,
top: 0,
bottom: 0
}
},
maxWidth: -1,
maxHeight: -1,
minWidth: -1,
minHeight: -1
}
padding = {
left: 0,
right: 0,
@ -186,6 +191,29 @@ export abstract class DoricViewNode {
this.applyCSSStyle({ width })
}
configSizeConstraints() {
if (this.layoutConfig.maxWidth && this.layoutConfig.maxWidth !== -1) {
this.applyCSSStyle({ maxWidth: toPixelString(this.layoutConfig.maxWidth) })
} else {
this.view.style.removeProperty('max-width')
}
if (this.layoutConfig.maxHeight && this.layoutConfig.maxHeight !== -1) {
this.applyCSSStyle({ maxHeight: toPixelString(this.layoutConfig.maxHeight) })
} else {
this.view.style.removeProperty('max-height')
}
if (this.layoutConfig.minWidth && this.layoutConfig.minWidth !== -1) {
this.applyCSSStyle({ minWidth: toPixelString(this.layoutConfig.minWidth) })
} else {
this.view.style.removeProperty('min-width')
}
if (this.layoutConfig.minHeight && this.layoutConfig.minHeight !== -1) {
this.applyCSSStyle({ minHeight: toPixelString(this.layoutConfig.minHeight) })
} else {
this.view.style.removeProperty('min-height')
}
}
configHeight() {
let height
switch (this.layoutConfig.heightSpec) {
@ -235,6 +263,7 @@ export abstract class DoricViewNode {
this.configPadding()
this.configWidth()
this.configHeight()
this.configSizeConstraints()
}
blendProps(v: HTMLElement, propName: string, prop: any) {