singel func

This commit is contained in:
jusax23 2022-08-10 21:56:12 +02:00
parent f2822f219f
commit fd8f139bf4
4 changed files with 235 additions and 93 deletions

View file

@ -1,9 +1,12 @@
import { SFrame, _ } from "../../main.js"; import { SFrame, _ } from "../../main.js";
import { fadein, fadeout } from "../../utils.js"; import { fadein, fadeout } from "../../utils.js";
const preRender = false; const call = async (stear, { find, resolve, render, call, event}, {text,titel=""}) => {
event.onloaded = ()=> {
const render = ({ }, {titel,text,callback}) => { fadein (find.main, 200, true);
find.btn._.focus();
}
event.onresolve = async () => await fadeout(find.main);
return _({ return _({
find: "main", find: "main",
@ -33,21 +36,17 @@ const render = ({ }, {titel,text,callback}) => {
}, [ }, [
_({ type: "h2", style: { marginBottom: 0 } }, titel), _({ type: "h2", style: { marginBottom: 0 } }, titel),
_({ type: "p" }, text), _({ type: "p" }, text),
_({ type: "button", find:"btn", event: {click: callback}, style:{ _({
type: "button",
find: "btn",
event: { click: ()=>resolve() },
style: {
borderRadius: "0.5rem", borderRadius: "0.5rem",
}},"OK"), }
}, "OK"),
])); ]));
} }
const call = async (stear, { find, resolve, render, call }, {text,titel=""}) => {
render({titel,text,callback:()=>{
resolve();
fadeout(find.main._);
}});
await fadein (find.main._, 200, true);
find.btn._.focus();
}
export default new SFrame({ export default new SFrame({
preRender, render, call preRender:true, call
}); });

View file

@ -1,7 +1,6 @@
import { SFrame, Stear, _ } from "../../main.js"; import { SFrame, Stear, _ } from "../../main.js";
import { fadein, fadeout, wait } from "../../utils.js"; import { fadein, fadeout, wait } from "../../utils.js";
const preRender = true;
Stear.addGlobalStyleJSON({ Stear.addGlobalStyleJSON({
position: "fixed", position: "fixed",
@ -19,20 +18,106 @@ Stear.addGlobalStyleJSON({
},".stear_status"); },".stear_status");
const render = ({ }, { }) => {
return _({
find:"main",
class:"stear_status",
});
}
const statusList = []; const statusList = [];
var statusActive = false; var statusActive = false;
const call = async (stear, { find, resolve, render, call }, { text, color="grey" }) => { const call = async (stear, { find, resolve, render, close, call, event }, { text, color = "grey" }) => {
statusList.push({ text, color, resolve }); statusList.push({ text, color, resolve });
if (statusActive) return; if (statusActive) return false;
statusActive = true;;
event.onloaded = () => {
fadein(find.main, 200, true);
};
event.onclose = async() => {
await fadeout(find.main);
};
event.onBeforRerender = async() => {
find.main.settings = { style: { backgroundColor: "#555" } };
await wait(200);
};
event.onAfterRerender = async() => {
find.main.settings = { style: { backgroundColor: "" } };
};
var next = statusList.shift();
var timeoutId = setTimeout(nextMsg,3000);
var inProgress = false;
async function nextMsg(){
if(inProgress)return;
inProgress = true;
if (timeoutId >= 0) clearTimeout(timeoutId);
timeoutId = -1;
next.resolve(null,false);
next = statusList.shift();
if(next == null){
statusActive = false;
close();
return;
}
render(false);
timeoutId = setTimeout(nextMsg, 3000);
inProgress = false;
}
return (first = true)=>_({
find: "main",
class: "stear_status",
style: {
border: "2px solid " + next.color,
backgroundColor: first ? "":"#555"
},
event: { click: nextMsg }
},next.text);
}
/*const call = async (stear, { find, resolve, render, call, event }, { text, color="grey" }) => {
async function loop(){
last = next;
next = statusList.shift();
if (next == null) return finish();
last.resolve(null, false);
find.main.settings = { style: { backgroundColor: "#555" } };
await wait(200);
find.main.settings = {
style: {
backgroundColor: "",
border: "2px solid " + next.color
}
};
find.main._.innerText = next.text;
timeoutId = setTimeout(loop,3000);
}
var timeoutId = setTimeout(loop, 3000);
find.main._.onclick = ()=>{
if(timeoutId<0)return;
clearTimeout(timeoutId);
timeoutId = -1;
loop();
};
async function finish(){
if (timeoutId >= 0)clearTimeout(timeoutId);
timeoutId = -1;
statusActive = false;
await fadeout(find.main._);
last.resolve();
}
}*/
/*const call = async (stear, { find, resolve, render, call, event }, { text, color="grey" }) => {
statusList.push({ text, color, resolve});
if (statusActive) return false;
statusActive = true; statusActive = true;
var next = statusList.shift(); var next = statusList.shift();
@ -43,7 +128,7 @@ const call = async (stear, { find, resolve, render, call }, { text, color="grey"
}}; }};
find.main._.innerText = next.text; find.main._.innerText = next.text;
await fadein(find.main._, 200, true); event.onloaded = () => fadein(find.main, 200, true);
//find.main._.style.transition = ""; //find.main._.style.transition = "";
async function loop(){ async function loop(){
@ -80,8 +165,13 @@ const call = async (stear, { find, resolve, render, call }, { text, color="grey"
last.resolve(); last.resolve();
} }
}
return _({
find: "main",
class: "stear_status",
});
}*/
export default new SFrame({ export default new SFrame({
preRender, render, call preRender:true, call
}); });

135
main.js
View file

@ -70,56 +70,73 @@ ${Object.entries(json).map(d => " " + toCssAttr(d[0]) + ": " + d[1] + ";").jo
export class SFrame{ export class SFrame{
#preRender; #preRender;
#render;
#call; #call;
#find = {};
#lastRender; constructor({ call, preRender = true }){
constructor({ preRender, render, call }){
this.#preRender = preRender; this.#preRender = preRender;
this.#render = render;
this.#call = call; this.#call = call;
if(this.#preRender){
this.render();
}
}
render(args={}){
this.#lastRender = this.#render({ find: this.#find }, args);
this.#lastRender.render;
for (var member in this.#find) delete this.#find[member];
Object.assign(this.#find, this.#lastRender.find);
return this.#lastRender;
} }
async call(stear, args, layer = 1){ async call(stear, args, layer = 1){
if(this.#preRender){ let lastRender;
stear.elem.appendChild(this.#lastRender._); let renderElem;
this.#lastRender._.style.zIndex = layer;
let event = { onloaded: () => { }, onclose: ()=>{}, onresolve: () => { }, onBeforRerender: () => { }, onAfterRerender: () => { } };
let find = {};
let resolved = false;
async function render(args){
if(!renderElem) return;
if(lastRender)if ([...(stear.elem.children)].includes(lastRender._)) stear.elem.removeChild(lastRender._);
let now = renderElem;
if(typeof now == "function")now = await now();
if(!(now instanceof class_)) throw new Error("The Element to render is not an instance of class_");
await now.build(args);
stear.elem.appendChild(now.render);
lastRender = now;
now._.style.zIndex = layer;
for (var member in find) delete find[member];
Object.assign(find, now.find);
return lastRender;
} }
return new Promise((res,rej)=>{ return new Promise(async (res,rej)=>{
this.#call(stear,{ let firstRender = false;
find: this.#find, renderElem = await this.#call(stear,{
render: (args) => { find,
this.render(args); render: async (...args) => {
/*for (var member in find) delete find[member]; await event.onBeforRerender(...args);
Object.assign(find, (this.#lastRender?.find) ?? {});*/ if(renderElem)await render(args);
if ([...(stear.elem.children)].indexOf(this.#lastRender._) >= 0) stear.elem.removeChild(this.#lastRender._); firstRender = true;
stear.elem.appendChild(this.#lastRender._); await event.onAfterRerender(...args);
this.#lastRender._.style.zIndex = layer; return find;
return this.#find;
}, },
resolve: (r,close=true)=>{ resolve: async (r,close=true)=>{
if (close&&this.#lastRender&&[...(stear.elem.children)].indexOf(this.#lastRender._) >= 0) stear.elem.removeChild(this.#lastRender._); if (resolved) return;
resolved = true;
await event.onresolve();
if (close&&lastRender&&[...(stear.elem.children)].includes(lastRender._))stear.elem.removeChild(lastRender._);
res(r); res(r);
}, },
call: (elem, args)=>{ call: (elem, args= {})=>{
return stear.call(elem,args,layer+1); return stear.call(elem,args,layer+1);
}, },
close: ()=>{ close: async ()=>{
if (close && this.#lastRender && [...(stear.elem.children)].indexOf(this.#lastRender._) >= 0) stear.elem.removeChild(this.#lastRender._); await event.onclose();
} if (close && lastRender && [...(stear.elem.children)].includes(lastRender._)) stear.elem.removeChild(lastRender._);
},
event
}, args); }, args);
if(!renderElem) {
}else{
if (this.#preRender | firstRender) await render([]);
event.onloaded();
}
}); });
} }
@ -129,7 +146,7 @@ export class SWindow extends SFrame{
#Frame; #Frame;
constructor({ preRender, render, call, backgroundColor = "transparent"}){ constructor({ call, preRender = true, backgroundColor = "transparent"}){
var Frame = _({ var Frame = _({
style: { style: {
top: "0px", top: "0px",
@ -144,10 +161,20 @@ export class SWindow extends SFrame{
find:"main" find:"main"
}, []); }, []);
super({ super({
preRender, render: (settings, args) => { call: async(...args) => _({
Frame.childs = [render(settings, args)]; style: {
return Frame; top: "0px",
}, call left: "0px",
position: "absolute",
height: "100%",
width: "100%",
display: "block",
backgroundColor,
//overflow:"scroll"
},
find: "main"
}, await call(...args)),
preRender
}); });
this.#Frame = Frame; this.#Frame = Frame;
} }
@ -157,6 +184,7 @@ export class SWindow extends SFrame{
export class class_ { export class class_ {
#elem; #elem;
#childs; #childs;
#build;
#find; #find;
constructor(settings,childs){ constructor(settings,childs){
@ -201,10 +229,29 @@ export class class_ {
} }
} }
async build (args) {
this.#build = [];
for (let i = 0; i < this.#childs.length; i++) {
let elem = this.#childs[i];
if (typeof elem == "function") elem = await elem(...args);
if(Array.isArray(elem)){
for (let j = 0; j < elem.length; j++) {
if (elem[j] instanceof class_) await elem[j].build(args);
}
this.#build.push(...elem);
}else{
if(elem instanceof class_)await elem.build(args);
this.#build.push(elem);
}
}
}
get render (){ get render (){
this.#elem.innerHTML = ""; this.#elem.innerHTML = "";
for (let i = 0; i < this.#childs.length; i++) { for (let i = 0; i < this.#build.length; i++) {
const elem = this.#childs[i]; const elem = this.#build[i];
if (typeof elem == "string") { if (typeof elem == "string") {
this.#elem.appendChild(document.createTextNode(elem)); this.#elem.appendChild(document.createTextNode(elem));
} else { } else {
@ -220,7 +267,7 @@ export class class_ {
get find (){ get find (){
var out = {}; var out = {};
this.#childs.forEach(d=>{ this.#build.forEach(d=>{
Object.assign(out,d.find); Object.assign(out,d.find);
}); });
if (this.#find) out[this.#find]=this; if (this.#find) out[this.#find]=this;

View file

@ -1,13 +1,17 @@
import { class_ } from "./main.js";
export const wait = (ms) => { export const wait = (ms) => {
return new Promise((res, rej) => { return new Promise((res, rej) => {
setTimeout(res, ms); setTimeout(res, ms);
}); });
} }
export const fadeout = async (elems, ms = 200, force = false) => { export const fadeout = async (Selems, ms = 200, force = false) => {
var oldTrans = []; var oldTrans = [];
if (!Array.isArray(elems)) elems = [elems]; if (!Array.isArray(Selems)) Selems = [Selems];
for (let i = 0; i < elems.length; i++) { var elems = [];
for (let i = 0; i < Selems.length; i++) {
elems[i] = Selems[i] instanceof class_ ? Selems[i]._ : Selems[i];
oldTrans[i] = elems[i].style.transition; oldTrans[i] = elems[i].style.transition;
elems[i].style.transition = `opacity ${ms}ms`; elems[i].style.transition = `opacity ${ms}ms`;
if(force){ if(force){
@ -25,10 +29,12 @@ export const fadeout = async (elems, ms = 200, force = false) => {
elems[i].style.transition = oldTrans[i]; elems[i].style.transition = oldTrans[i];
} }
} }
export const fadein = async (elems, ms = 200, force = false, display="") => { export const fadein = async (Selems, ms = 200, force = false, display="") => {
var oldTrans = []; var oldTrans = [];
if (!Array.isArray(elems)) elems = [elems]; if (!Array.isArray(Selems)) Selems = [Selems];
for (let i = 0; i < elems.length; i++) { var elems = [];
for (let i = 0; i < Selems.length; i++) {
elems[i] = (Selems[i] instanceof class_) ? Selems[i]._ : Selems[i];
oldTrans[i] = elems[i].style.transition oldTrans[i] = elems[i].style.transition
elems[i].style.transition = `opacity ${ms}ms`; elems[i].style.transition = `opacity ${ms}ms`;
elems[i].style.display = display; elems[i].style.display = display;