Skip to content

Commit 184b0e7

Browse files
committed
fixed load css of not compiled components
1 parent 1160daf commit 184b0e7

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

hrt/impl/DomkitViewer.hx

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,18 +205,24 @@ class DomkitViewer extends h2d.Object {
205205
var loadedComponents : Array<domkit.Component<h2d.Object, h2d.Object>> = [];
206206
var compHooks : Map<String,Array<Dynamic> -> h2d.Object -> h2d.Object> = [];
207207
var definedClasses : Array<String> = [];
208-
var loadedResources : Array<hxd.res.Resource>;
208+
var loadedResources : Array<{ r : hxd.res.Resource, wasLoaded : Bool }> = [];
209209

210210
public function new( style : DomkitStyle, res : hxd.res.Resource, ?parent ) {
211211
super(parent);
212212
this.style = style;
213213
this.resource = res;
214-
loadedResources = [res];
215-
res.watch(rebuild);
214+
loadComponents(res);
216215
addContext(new DomkitBaseContext());
217216
rebuildDelay();
218217
}
219218

219+
function loadComponents( res : hxd.res.Resource ) {
220+
var loaded = @:privateAccess style.resources.indexOf(res) >= 0;
221+
loadedResources.push({ r : res, wasLoaded: loaded });
222+
if( !loaded ) style.load(res);
223+
res.watch(rebuild);
224+
}
225+
220226
function rebuildDelay() {
221227
if( rebuilding ) return;
222228
rebuilding = true;
@@ -264,8 +270,12 @@ class DomkitViewer extends h2d.Object {
264270
if( currentObj != null )
265271
currentObj.remove();
266272
// force re-watch
267-
for( r in loadedResources )
268-
style.load(r);
273+
for( r in loadedResources ) {
274+
if( r.wasLoaded )
275+
style.load(r.r);
276+
else
277+
style.unload(r.r);
278+
}
269279
for( c in loadedComponents ) {
270280
@:privateAccess domkit.Component.COMPONENTS.remove(c.name);
271281
@:privateAccess domkit.CssStyle.CssData.COMPONENTS.remove(c);

0 commit comments

Comments
 (0)