@symbo.ls/scratch 2.11.5 → 2.11.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -457,13 +457,11 @@ var require_object = __commonJS({
457
457
  isEqualDeep: () => isEqualDeep,
458
458
  map: () => map,
459
459
  merge: () => merge,
460
- mergeAndCloneIfArray: () => mergeAndCloneIfArray,
461
- mergeArray: () => mergeArray,
462
- mergeArrayExclude: () => mergeArrayExclude,
463
460
  mergeIfExisted: () => mergeIfExisted,
464
461
  overwrite: () => overwrite,
465
462
  overwriteDeep: () => overwriteDeep,
466
463
  overwriteObj: () => overwriteObj,
464
+ overwriteShallow: () => overwriteShallow,
467
465
  removeFromObject: () => removeFromObject
468
466
  });
469
467
  module2.exports = __toCommonJS2(object_exports);
@@ -480,81 +478,75 @@ var require_object = __commonJS({
480
478
  return param;
481
479
  };
482
480
  var map = (obj, extention, element) => {
483
- for (const e in extention) {
484
- obj[e] = exec(extention[e], element);
481
+ for (const e2 in extention) {
482
+ obj[e2] = exec(extention[e2], element);
485
483
  }
486
484
  };
487
485
  var merge = (element, obj) => {
488
- for (const e in obj) {
489
- const elementProp = element[e];
490
- const objProp = obj[e];
486
+ for (const e2 in obj) {
487
+ const elementProp = element[e2];
488
+ const objProp = obj[e2];
491
489
  if (elementProp === void 0) {
492
- element[e] = objProp;
490
+ element[e2] = objProp;
493
491
  }
494
492
  }
495
493
  return element;
496
494
  };
497
- var deepMerge2 = (element, extend) => {
498
- for (const e in extend) {
499
- const elementProp = element[e];
500
- const extendProp = extend[e];
501
- if (e === "parent" || e === "props")
495
+ var deepMerge2 = (element, extend, excludeFrom = []) => {
496
+ for (const e2 in extend) {
497
+ if (excludeFrom.includes(e2) || e2.includes("__"))
502
498
  continue;
499
+ const elementProp = element[e2];
500
+ const extendProp = extend[e2];
503
501
  if ((0, import_types.isObjectLike)(elementProp) && (0, import_types.isObjectLike)(extendProp)) {
504
502
  deepMerge2(elementProp, extendProp);
505
503
  } else if (elementProp === void 0) {
506
- element[e] = extendProp;
504
+ element[e2] = extendProp;
507
505
  }
508
506
  }
509
507
  return element;
510
508
  };
511
- var clone = (obj) => {
509
+ var clone = (obj, excludeFrom = []) => {
512
510
  const o = {};
513
511
  for (const prop in obj) {
514
- if (prop === "node")
512
+ if (excludeFrom.includes(e) || e.includes("__"))
515
513
  continue;
516
514
  o[prop] = obj[prop];
517
515
  }
518
516
  return o;
519
517
  };
520
- var deepCloneExclude = (obj, exclude = []) => {
518
+ var deepCloneExclude = (obj, excludeFrom = []) => {
521
519
  if ((0, import_types.isArray)(obj)) {
522
- return obj.map((x) => deepCloneExclude(x, exclude));
520
+ return obj.map((x) => deepCloneExclude(x, excludeFrom));
523
521
  }
524
522
  const o = {};
525
523
  for (const k in obj) {
526
- if (exclude.indexOf(k) > -1)
524
+ if (excludeFrom.includes(k) || k.includes("__"))
527
525
  continue;
528
526
  let v = obj[k];
529
527
  if (k === "extend" && (0, import_types.isArray)(v)) {
530
- v = mergeArrayExclude(v, exclude);
528
+ v = mergeArrayExclude(v, excludeFrom);
531
529
  }
532
530
  if ((0, import_types.isArray)(v)) {
533
- o[k] = v.map((x) => deepCloneExclude(x, exclude));
531
+ o[k] = v.map((x) => deepCloneExclude(x, excludeFrom));
534
532
  } else if ((0, import_types.isObject)(v)) {
535
- o[k] = deepCloneExclude(v, exclude);
533
+ o[k] = deepCloneExclude(v, excludeFrom);
536
534
  } else
537
535
  o[k] = v;
538
536
  }
539
537
  return o;
540
538
  };
541
- var mergeArrayExclude = (arr, excl = []) => {
542
- return arr.reduce((acc, curr) => deepMerge2(acc, deepCloneExclude(curr, excl)), {});
543
- };
544
- var deepClone2 = (obj) => {
545
- if ((0, import_types.isArray)(obj)) {
546
- return obj.map(deepClone2);
547
- }
548
- const o = {};
539
+ var deepClone2 = (obj, excludeFrom = []) => {
540
+ const o = (0, import_types.isArray)(obj) ? [] : {};
549
541
  for (const prop in obj) {
542
+ if (excludeFrom.includes(prop) || prop.includes("__"))
543
+ continue;
550
544
  let objProp = obj[prop];
551
545
  if (prop === "extend" && (0, import_types.isArray)(objProp)) {
552
546
  objProp = mergeArray(objProp);
553
547
  }
554
- if ((0, import_types.isArray)(objProp)) {
555
- o[prop] = objProp.map((v) => (0, import_types.isObject)(v) ? deepClone2(v) : v);
556
- } else if ((0, import_types.isObject)(objProp)) {
557
- o[prop] = deepClone2(objProp);
548
+ if ((0, import_types.isObjectLike)(objProp)) {
549
+ o[prop] = deepClone2(objProp, excludeFrom);
558
550
  } else
559
551
  o[prop] = objProp;
560
552
  }
@@ -620,8 +612,8 @@ var require_object = __commonJS({
620
612
  try {
621
613
  const evalProp = import_globals2.window.eval(`(${objProp})`);
622
614
  stringified[prop] = evalProp;
623
- } catch (e) {
624
- if (e)
615
+ } catch (e2) {
616
+ if (e2)
625
617
  stringified[prop] = objProp;
626
618
  }
627
619
  } else {
@@ -635,8 +627,8 @@ var require_object = __commonJS({
635
627
  try {
636
628
  const evalProp = import_globals2.window.eval(`(${arrProp})`);
637
629
  stringified[prop].push(evalProp);
638
- } catch (e) {
639
- if (e)
630
+ } catch (e2) {
631
+ if (e2)
640
632
  stringified[prop].push(arrProp);
641
633
  }
642
634
  } else {
@@ -656,32 +648,32 @@ var require_object = __commonJS({
656
648
  }
657
649
  return stringified;
658
650
  };
659
- var overwrite = (element, params, options) => {
651
+ var overwrite = (element, params, excludeFrom = []) => {
660
652
  const { ref } = element;
661
653
  const changes = {};
662
- for (const e in params) {
663
- if (e === "props")
654
+ for (const e2 in params) {
655
+ if (excludeFrom.includes(e2) || e2.includes("__"))
664
656
  continue;
665
- const elementProp = element[e];
666
- const paramsProp = params[e];
657
+ const elementProp = element[e2];
658
+ const paramsProp = params[e2];
667
659
  if (paramsProp) {
668
- ref.__cache[e] = changes[e] = elementProp;
669
- ref[e] = paramsProp;
660
+ ref.__cache[e2] = changes[e2] = elementProp;
661
+ ref[e2] = paramsProp;
670
662
  }
671
663
  }
672
664
  return changes;
673
665
  };
674
666
  var diffObjects = (original, objToDiff, cache) => {
675
- for (const e in objToDiff) {
676
- if (e === "ref")
667
+ for (const e2 in objToDiff) {
668
+ if (e2 === "ref")
677
669
  continue;
678
- const originalProp = original[e];
679
- const objToDiffProp = objToDiff[e];
670
+ const originalProp = original[e2];
671
+ const objToDiffProp = objToDiff[e2];
680
672
  if ((0, import_types.isObject)(originalProp) && (0, import_types.isObject)(objToDiffProp)) {
681
- cache[e] = {};
682
- diff(originalProp, objToDiffProp, cache[e]);
673
+ cache[e2] = {};
674
+ diff(originalProp, objToDiffProp, cache[e2]);
683
675
  } else if (objToDiffProp !== void 0) {
684
- cache[e] = objToDiffProp;
676
+ cache[e2] = objToDiffProp;
685
677
  }
686
678
  }
687
679
  return cache;
@@ -714,23 +706,33 @@ var require_object = __commonJS({
714
706
  };
715
707
  var overwriteObj = (params, obj) => {
716
708
  const changes = {};
717
- for (const e in params) {
718
- const objProp = obj[e];
719
- const paramsProp = params[e];
709
+ for (const e2 in params) {
710
+ const objProp = obj[e2];
711
+ const paramsProp = params[e2];
720
712
  if (paramsProp) {
721
- obj[e] = changes[e] = objProp;
713
+ obj[e2] = changes[e2] = objProp;
722
714
  }
723
715
  }
724
716
  return changes;
725
717
  };
726
- var overwriteDeep = (params, obj) => {
727
- for (const e in params) {
728
- const objProp = obj[e];
729
- const paramsProp = params[e];
718
+ var overwriteShallow = (obj, params, excludeFrom = []) => {
719
+ for (const e2 in params) {
720
+ if (excludeFrom.includes(e2) || e2.includes("__"))
721
+ continue;
722
+ obj[e2] = params[e2];
723
+ }
724
+ return obj;
725
+ };
726
+ var overwriteDeep = (params, obj, excludeFrom = []) => {
727
+ for (const e2 in params) {
728
+ if (excludeFrom.includes(e2) || e2.includes("__"))
729
+ continue;
730
+ const objProp = obj[e2];
731
+ const paramsProp = params[e2];
730
732
  if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
731
733
  overwriteDeep(paramsProp, objProp);
732
734
  } else if (paramsProp !== void 0) {
733
- obj[e] = paramsProp;
735
+ obj[e2] = paramsProp;
734
736
  }
735
737
  }
736
738
  return obj;
@@ -740,12 +742,6 @@ var require_object = __commonJS({
740
742
  return deepMerge2(a, b);
741
743
  return a || b;
742
744
  };
743
- var mergeArray = (arr) => {
744
- return arr.reduce((a, c) => deepMerge2(a, deepClone2(c)), {});
745
- };
746
- var mergeAndCloneIfArray = (obj) => {
747
- return (0, import_types.isArray)(obj) ? mergeArray(obj) : deepClone2(obj);
748
- };
749
745
  var flattenRecursive = (param, prop, stack = []) => {
750
746
  const objectized = mergeAndCloneIfArray(param);
751
747
  stack.push(objectized);
@@ -867,10 +863,13 @@ var require_array = __commonJS({
867
863
  __export2(array_exports, {
868
864
  arrayContainsOtherArray: () => arrayContainsOtherArray,
869
865
  joinArrays: () => joinArrays,
866
+ mergeAndCloneIfArray: () => mergeAndCloneIfArray2,
867
+ mergeArray: () => mergeArray2,
870
868
  removeFromArray: () => removeFromArray,
871
869
  swapItemsInArray: () => swapItemsInArray
872
870
  });
873
871
  module2.exports = __toCommonJS2(array_exports);
872
+ var import_object = require_object();
874
873
  var import_types = require_types();
875
874
  var arrayContainsOtherArray = (arr1, arr2) => {
876
875
  return arr2.every((val) => arr1.includes(val));
@@ -896,6 +895,12 @@ var require_array = __commonJS({
896
895
  var joinArrays = (...arrays) => {
897
896
  return [].concat(...arrays);
898
897
  };
898
+ var mergeArray2 = (arr, excludeFrom = []) => {
899
+ return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepClone)(c, excludeFrom), excludeFrom), {});
900
+ };
901
+ var mergeAndCloneIfArray2 = (obj) => {
902
+ return (0, import_types.isArray)(obj) ? mergeArray2(obj) : (0, import_object.deepClone)(obj);
903
+ };
899
904
  }
900
905
  });
901
906
 
@@ -457,13 +457,11 @@ var require_object = __commonJS({
457
457
  isEqualDeep: () => isEqualDeep,
458
458
  map: () => map,
459
459
  merge: () => merge5,
460
- mergeAndCloneIfArray: () => mergeAndCloneIfArray,
461
- mergeArray: () => mergeArray,
462
- mergeArrayExclude: () => mergeArrayExclude,
463
460
  mergeIfExisted: () => mergeIfExisted,
464
461
  overwrite: () => overwrite,
465
462
  overwriteDeep: () => overwriteDeep,
466
463
  overwriteObj: () => overwriteObj,
464
+ overwriteShallow: () => overwriteShallow,
467
465
  removeFromObject: () => removeFromObject
468
466
  });
469
467
  module2.exports = __toCommonJS2(object_exports);
@@ -480,81 +478,75 @@ var require_object = __commonJS({
480
478
  return param;
481
479
  };
482
480
  var map = (obj, extention, element) => {
483
- for (const e in extention) {
484
- obj[e] = exec(extention[e], element);
481
+ for (const e2 in extention) {
482
+ obj[e2] = exec(extention[e2], element);
485
483
  }
486
484
  };
487
485
  var merge5 = (element, obj) => {
488
- for (const e in obj) {
489
- const elementProp = element[e];
490
- const objProp = obj[e];
486
+ for (const e2 in obj) {
487
+ const elementProp = element[e2];
488
+ const objProp = obj[e2];
491
489
  if (elementProp === void 0) {
492
- element[e] = objProp;
490
+ element[e2] = objProp;
493
491
  }
494
492
  }
495
493
  return element;
496
494
  };
497
- var deepMerge3 = (element, extend) => {
498
- for (const e in extend) {
499
- const elementProp = element[e];
500
- const extendProp = extend[e];
501
- if (e === "parent" || e === "props")
495
+ var deepMerge3 = (element, extend, excludeFrom = []) => {
496
+ for (const e2 in extend) {
497
+ if (excludeFrom.includes(e2) || e2.includes("__"))
502
498
  continue;
499
+ const elementProp = element[e2];
500
+ const extendProp = extend[e2];
503
501
  if ((0, import_types.isObjectLike)(elementProp) && (0, import_types.isObjectLike)(extendProp)) {
504
502
  deepMerge3(elementProp, extendProp);
505
503
  } else if (elementProp === void 0) {
506
- element[e] = extendProp;
504
+ element[e2] = extendProp;
507
505
  }
508
506
  }
509
507
  return element;
510
508
  };
511
- var clone = (obj) => {
509
+ var clone = (obj, excludeFrom = []) => {
512
510
  const o = {};
513
511
  for (const prop in obj) {
514
- if (prop === "node")
512
+ if (excludeFrom.includes(e) || e.includes("__"))
515
513
  continue;
516
514
  o[prop] = obj[prop];
517
515
  }
518
516
  return o;
519
517
  };
520
- var deepCloneExclude = (obj, exclude = []) => {
518
+ var deepCloneExclude = (obj, excludeFrom = []) => {
521
519
  if ((0, import_types.isArray)(obj)) {
522
- return obj.map((x) => deepCloneExclude(x, exclude));
520
+ return obj.map((x) => deepCloneExclude(x, excludeFrom));
523
521
  }
524
522
  const o = {};
525
523
  for (const k in obj) {
526
- if (exclude.indexOf(k) > -1)
524
+ if (excludeFrom.includes(k) || k.includes("__"))
527
525
  continue;
528
526
  let v = obj[k];
529
527
  if (k === "extend" && (0, import_types.isArray)(v)) {
530
- v = mergeArrayExclude(v, exclude);
528
+ v = mergeArrayExclude(v, excludeFrom);
531
529
  }
532
530
  if ((0, import_types.isArray)(v)) {
533
- o[k] = v.map((x) => deepCloneExclude(x, exclude));
531
+ o[k] = v.map((x) => deepCloneExclude(x, excludeFrom));
534
532
  } else if ((0, import_types.isObject)(v)) {
535
- o[k] = deepCloneExclude(v, exclude);
533
+ o[k] = deepCloneExclude(v, excludeFrom);
536
534
  } else
537
535
  o[k] = v;
538
536
  }
539
537
  return o;
540
538
  };
541
- var mergeArrayExclude = (arr, excl = []) => {
542
- return arr.reduce((acc, curr) => deepMerge3(acc, deepCloneExclude(curr, excl)), {});
543
- };
544
- var deepClone2 = (obj) => {
545
- if ((0, import_types.isArray)(obj)) {
546
- return obj.map(deepClone2);
547
- }
548
- const o = {};
539
+ var deepClone2 = (obj, excludeFrom = []) => {
540
+ const o = (0, import_types.isArray)(obj) ? [] : {};
549
541
  for (const prop in obj) {
542
+ if (excludeFrom.includes(prop) || prop.includes("__"))
543
+ continue;
550
544
  let objProp = obj[prop];
551
545
  if (prop === "extend" && (0, import_types.isArray)(objProp)) {
552
546
  objProp = mergeArray(objProp);
553
547
  }
554
- if ((0, import_types.isArray)(objProp)) {
555
- o[prop] = objProp.map((v) => (0, import_types.isObject)(v) ? deepClone2(v) : v);
556
- } else if ((0, import_types.isObject)(objProp)) {
557
- o[prop] = deepClone2(objProp);
548
+ if ((0, import_types.isObjectLike)(objProp)) {
549
+ o[prop] = deepClone2(objProp, excludeFrom);
558
550
  } else
559
551
  o[prop] = objProp;
560
552
  }
@@ -620,8 +612,8 @@ var require_object = __commonJS({
620
612
  try {
621
613
  const evalProp = import_globals3.window.eval(`(${objProp})`);
622
614
  stringified[prop] = evalProp;
623
- } catch (e) {
624
- if (e)
615
+ } catch (e2) {
616
+ if (e2)
625
617
  stringified[prop] = objProp;
626
618
  }
627
619
  } else {
@@ -635,8 +627,8 @@ var require_object = __commonJS({
635
627
  try {
636
628
  const evalProp = import_globals3.window.eval(`(${arrProp})`);
637
629
  stringified[prop].push(evalProp);
638
- } catch (e) {
639
- if (e)
630
+ } catch (e2) {
631
+ if (e2)
640
632
  stringified[prop].push(arrProp);
641
633
  }
642
634
  } else {
@@ -656,32 +648,32 @@ var require_object = __commonJS({
656
648
  }
657
649
  return stringified;
658
650
  };
659
- var overwrite = (element, params, options) => {
651
+ var overwrite = (element, params, excludeFrom = []) => {
660
652
  const { ref } = element;
661
653
  const changes = {};
662
- for (const e in params) {
663
- if (e === "props")
654
+ for (const e2 in params) {
655
+ if (excludeFrom.includes(e2) || e2.includes("__"))
664
656
  continue;
665
- const elementProp = element[e];
666
- const paramsProp = params[e];
657
+ const elementProp = element[e2];
658
+ const paramsProp = params[e2];
667
659
  if (paramsProp) {
668
- ref.__cache[e] = changes[e] = elementProp;
669
- ref[e] = paramsProp;
660
+ ref.__cache[e2] = changes[e2] = elementProp;
661
+ ref[e2] = paramsProp;
670
662
  }
671
663
  }
672
664
  return changes;
673
665
  };
674
666
  var diffObjects = (original, objToDiff, cache) => {
675
- for (const e in objToDiff) {
676
- if (e === "ref")
667
+ for (const e2 in objToDiff) {
668
+ if (e2 === "ref")
677
669
  continue;
678
- const originalProp = original[e];
679
- const objToDiffProp = objToDiff[e];
670
+ const originalProp = original[e2];
671
+ const objToDiffProp = objToDiff[e2];
680
672
  if ((0, import_types.isObject)(originalProp) && (0, import_types.isObject)(objToDiffProp)) {
681
- cache[e] = {};
682
- diff(originalProp, objToDiffProp, cache[e]);
673
+ cache[e2] = {};
674
+ diff(originalProp, objToDiffProp, cache[e2]);
683
675
  } else if (objToDiffProp !== void 0) {
684
- cache[e] = objToDiffProp;
676
+ cache[e2] = objToDiffProp;
685
677
  }
686
678
  }
687
679
  return cache;
@@ -714,23 +706,33 @@ var require_object = __commonJS({
714
706
  };
715
707
  var overwriteObj = (params, obj) => {
716
708
  const changes = {};
717
- for (const e in params) {
718
- const objProp = obj[e];
719
- const paramsProp = params[e];
709
+ for (const e2 in params) {
710
+ const objProp = obj[e2];
711
+ const paramsProp = params[e2];
720
712
  if (paramsProp) {
721
- obj[e] = changes[e] = objProp;
713
+ obj[e2] = changes[e2] = objProp;
722
714
  }
723
715
  }
724
716
  return changes;
725
717
  };
726
- var overwriteDeep = (params, obj) => {
727
- for (const e in params) {
728
- const objProp = obj[e];
729
- const paramsProp = params[e];
718
+ var overwriteShallow = (obj, params, excludeFrom = []) => {
719
+ for (const e2 in params) {
720
+ if (excludeFrom.includes(e2) || e2.includes("__"))
721
+ continue;
722
+ obj[e2] = params[e2];
723
+ }
724
+ return obj;
725
+ };
726
+ var overwriteDeep = (params, obj, excludeFrom = []) => {
727
+ for (const e2 in params) {
728
+ if (excludeFrom.includes(e2) || e2.includes("__"))
729
+ continue;
730
+ const objProp = obj[e2];
731
+ const paramsProp = params[e2];
730
732
  if ((0, import_types.isObjectLike)(objProp) && (0, import_types.isObjectLike)(paramsProp)) {
731
733
  overwriteDeep(paramsProp, objProp);
732
734
  } else if (paramsProp !== void 0) {
733
- obj[e] = paramsProp;
735
+ obj[e2] = paramsProp;
734
736
  }
735
737
  }
736
738
  return obj;
@@ -740,12 +742,6 @@ var require_object = __commonJS({
740
742
  return deepMerge3(a, b);
741
743
  return a || b;
742
744
  };
743
- var mergeArray = (arr) => {
744
- return arr.reduce((a, c) => deepMerge3(a, deepClone2(c)), {});
745
- };
746
- var mergeAndCloneIfArray = (obj) => {
747
- return (0, import_types.isArray)(obj) ? mergeArray(obj) : deepClone2(obj);
748
- };
749
745
  var flattenRecursive = (param, prop, stack = []) => {
750
746
  const objectized = mergeAndCloneIfArray(param);
751
747
  stack.push(objectized);
@@ -867,10 +863,13 @@ var require_array = __commonJS({
867
863
  __export2(array_exports, {
868
864
  arrayContainsOtherArray: () => arrayContainsOtherArray,
869
865
  joinArrays: () => joinArrays,
866
+ mergeAndCloneIfArray: () => mergeAndCloneIfArray2,
867
+ mergeArray: () => mergeArray2,
870
868
  removeFromArray: () => removeFromArray,
871
869
  swapItemsInArray: () => swapItemsInArray
872
870
  });
873
871
  module2.exports = __toCommonJS2(array_exports);
872
+ var import_object = require_object();
874
873
  var import_types = require_types();
875
874
  var arrayContainsOtherArray = (arr1, arr2) => {
876
875
  return arr2.every((val) => arr1.includes(val));
@@ -896,6 +895,12 @@ var require_array = __commonJS({
896
895
  var joinArrays = (...arrays) => {
897
896
  return [].concat(...arrays);
898
897
  };
898
+ var mergeArray2 = (arr, excludeFrom = []) => {
899
+ return arr.reduce((a, c) => (0, import_object.deepMerge)(a, (0, import_object.deepClone)(c, excludeFrom), excludeFrom), {});
900
+ };
901
+ var mergeAndCloneIfArray2 = (obj) => {
902
+ return (0, import_types.isArray)(obj) ? mergeArray2(obj) : (0, import_object.deepClone)(obj);
903
+ };
899
904
  }
900
905
  });
901
906
 
@@ -1599,8 +1604,8 @@ var convertSvgToSymbol = (key, code) => {
1599
1604
  };
1600
1605
 
1601
1606
  // src/system/color.js
1602
- var getColor = (value, key) => {
1603
- const CONFIG2 = getActiveConfig();
1607
+ var getColor = (value, key, config) => {
1608
+ const CONFIG2 = config || getActiveConfig();
1604
1609
  if (!(0, import_utils8.isString)(value)) {
1605
1610
  if (CONFIG2.verbose)
1606
1611
  console.warn(value, "- type for color is not valid");
@@ -1625,34 +1630,32 @@ var getColor = (value, key) => {
1625
1630
  console.warn(value, " - does not have ", key);
1626
1631
  }
1627
1632
  let rgb = val.rgb;
1628
- if (rgb) {
1629
- if (tone) {
1630
- if (!val[tone]) {
1631
- const toHex = rgbArrayToHex(rgb.split(", ").map((v) => parseFloat(v)));
1632
- const abs = tone.slice(0, 1);
1633
- if (abs === "-" || abs === "+") {
1634
- rgb = hexToRgbArray(
1635
- getColorShade(toHex, parseFloat(tone))
1636
- ).join(", ");
1637
- } else {
1638
- const [r, g, b] = [...rgb.split(", ").map((v) => parseInt(v))];
1639
- const hsl = rgbToHSL(r, g, b);
1640
- const [h, s, l] = hsl;
1641
- const newRgb = hslToRgb(h, s, parseFloat(tone) / 100 * 255);
1642
- rgb = newRgb;
1643
- }
1644
- val[tone] = { rgb, var: `${val.var}-${tone}` };
1645
- } else
1646
- rgb = val[tone].rgb;
1647
- }
1648
- if (alpha)
1649
- return `rgba(${rgb}, ${alpha})`;
1650
- return CONFIG2.useVariable ? `var(${val.var})` : `rgb(${rgb})`;
1651
- } else
1633
+ if (!rgb)
1652
1634
  return CONFIG2.useVariable ? `var(${val.var})` : val.value;
1653
- };
1654
- var getMediaColor = (value, globalTheme) => {
1655
- const CONFIG2 = getActiveConfig();
1635
+ if (tone && !val[tone]) {
1636
+ const toHex = rgbArrayToHex(rgb.split(", ").map((v) => parseFloat(v)));
1637
+ const abs = tone.slice(0, 1);
1638
+ if (abs === "-" || abs === "+") {
1639
+ rgb = hexToRgbArray(
1640
+ getColorShade(toHex, parseFloat(tone))
1641
+ ).join(", ");
1642
+ } else {
1643
+ const [r, g, b] = [...rgb.split(", ").map((v) => parseInt(v))];
1644
+ const hsl = rgbToHSL(r, g, b);
1645
+ const [h, s, l] = hsl;
1646
+ const newRgb = hslToRgb(h, s, parseFloat(tone) / 100 * 255);
1647
+ rgb = newRgb;
1648
+ }
1649
+ val[tone] = { rgb, var: `${val.var}-${tone}` };
1650
+ }
1651
+ if (val[tone])
1652
+ rgb = val[tone].rgb;
1653
+ if (alpha)
1654
+ return `rgba(${rgb}, ${alpha})`;
1655
+ return CONFIG2.useVariable ? `var(${val.var})` : `rgb(${rgb})`;
1656
+ };
1657
+ var getMediaColor = (value, globalTheme, config) => {
1658
+ const CONFIG2 = config || getActiveConfig();
1656
1659
  if (!globalTheme)
1657
1660
  globalTheme = CONFIG2.globalTheme;
1658
1661
  if (!(0, import_utils8.isString)(value)) {
@@ -1667,16 +1670,16 @@ var getMediaColor = (value, globalTheme) => {
1667
1670
  const val = COLOR2[name] || GRADIENT2[name];
1668
1671
  const isObj = (0, import_utils8.isObject)(val);
1669
1672
  if (isObj && val.value)
1670
- return getColor(value, `@${globalTheme}`);
1673
+ return getColor(value, `@${globalTheme}`, config);
1671
1674
  else if (isObj) {
1672
1675
  if (globalTheme)
1673
- return getColor(value, `@${globalTheme}`);
1676
+ return getColor(value, `@${globalTheme}`, config);
1674
1677
  else {
1675
1678
  const obj = {};
1676
1679
  for (const mediaName in val) {
1677
1680
  const query = CONFIG2.MEDIA[mediaName.slice(1)];
1678
1681
  const media = `@media screen and ${query}`;
1679
- obj[media] = getColor(value, mediaName);
1682
+ obj[media] = getColor(value, mediaName, config);
1680
1683
  }
1681
1684
  return obj;
1682
1685
  }
@@ -2293,7 +2296,7 @@ var applyReset = (reset = {}) => {
2293
2296
  top: "0",
2294
2297
  left: "0",
2295
2298
  margin: "0",
2296
- WebkitFontSmoothing: "antialiased",
2299
+ WebkitFontSmoothing: "subpixel-antialiased",
2297
2300
  scrollBehavior: "smooth",
2298
2301
  fontSize: TYPOGRAPHY2.browserDefault + "px",
2299
2302
  ...CONFIG2.useDocumentTheme ? getMediaTheme("document", `@${CONFIG2.globalTheme}`) : {},