@msviderok/base-ui-solid 1.0.0-beta.2 → 1.0.0-beta.8

package/README.md

@@ -1,48 +1,27 @@
 <!-- markdownlint-disable MD041 -->
 
-<a href="https://base-ui.com" rel="noopener" target="_blank"><img width="150" height="133" src="https://base-ui.com/static/logo.svg" alt="Base UI logo"></a>
+# _(WIP)_ This project is a work in progress.
 
-Base UI is a library of unstyled Solid components. You gain complete control over your app's CSS and accessibility features.
+- Library is compatible with **@base-ui-components/react@1.0.0-beta.1**
+- Docs have everything copied over from the original React-based docs so **_a lot_** of discrepancies in text are present
 
-## Installation
+### Please, consider supporting an awesome Base UI team directly on [OpenCollective](https://opencollective.com/mui-org). This port is a gesture of appreciation of an increadible work they've been doing.
+
+### Link to the original library: [Base UI GitHub](https://github.com/mui/base-ui)
 
-Install the package in your project directory with:
+<hr />
+
+## Installation
 
 ```bash
-npm install @base-ui-components/solid
+npm install @msviderok/base-ui-solid
 ```
 
 ## Documentation
 
-<!-- #default-branch-switch -->
-
-Visit [base-ui.com](https://base-ui.com) to view the full documentation.
-
-## Questions
-
-For how-to questions that don't involve making changes to the code base, please use [Stack Overflow](https://stackoverflow.com/questions/tagged/base-ui) instead of GitHub issues.
-Use the "base-ui" tag on Stack Overflow to make it easier for the community to find your question.
-
-## Contributing
-
-Read the [contributing guide](/CONTRIBUTING.md) to learn about our development process, how to propose bug fixes and improvements, and how to build and test your changes.
-
-Contributing to Base UI is about more than just issues and pull requests!
-There are many other ways to [support Base UI](https://mui.com/material-ui/getting-started/faq/#mui-is-awesome-how-can-i-support-the-project) beyond contributing to the code base.
-
-## Changelog
-
-The [changelog](https://github.com/mui/base-ui/releases) is regularly updated to reflect what's changed in each new release.
-
-## Roadmap
-
-Future plans and high-priority features and enhancements can be found in the [roadmap](https://github.com/orgs/mui/projects/1).
+### [base-ui-docs-solid.vercel.app](https://base-ui-docs-solid.vercel.app/)
 
 ## License
 
 This project is licensed under the terms of the
 [MIT license](/LICENSE).
-
-## Security
-
-For details of supported versions and contact details for reporting security issues, please refer to the [security policy](https://github.com/mui/base-ui/security/policy).

package/cjs/merge-props/mergeProps.js

@@ -133,23 +133,32 @@ function mergeProps(...args) {
   for (let props of sources) {
     let propsOverride = false;
     if (typeof props === 'function') {
-      const mergedListeners = {
-        ...cachedListeners
+      const mergedListeners = Object.assign({}, cachedListeners);
+      const mergedStyles = Object.assign([], cacheStyles);
+      const mergedRefs = Object.assign([], cacheRefs);
+      const mergedClasses = Object.assign([], cacheClasses);
+      const mergedClassList = Object.assign([], cacheClassList);
+      const localMerged = {
+        get style() {
+          return reduce(mergedStyles, 'style', combineStyle);
+        },
+        get ref() {
+          return reverseChain(mergedRefs);
+        },
+        get class() {
+          return reduce(mergedClasses, 'class', (a, b) => `${a} ${b}`);
+        },
+        get classList() {
+          return reduce(mergedClassList, 'classList', (a, b) => ({
+            ...a,
+            ...b
+          }));
+        }
       };
-      const mergedStyles = reduce(cacheStyles, 'style', combineStyle);
-      const mergedRefs = reverseChain(cacheRefs);
-      const mergedClasses = reduce(cacheClasses, 'class', (a, b) => `${a} ${b}`);
-      const mergedClassList = reduce(cacheClassList, 'classList', (a, b) => ({
-        ...a,
-        ...b
-      }));
       const mergedForGetter = new Proxy(merge, {
         get(target, key, receiver) {
           if (typeof key !== 'string') return Reflect.get(target, key, receiver);
-          if (key === 'style') return mergedStyles;
-          if (key === 'ref') return mergedRefs;
-          if (key === 'class') return mergedClasses;
-          if (key === 'classList') return mergedClassList;
+          if (key in localMerged) return localMerged[key];
           if (key[0] === 'o' && key[1] === 'n' && key[2]) {
             const name = key.toLowerCase();
             if (name in mergedListeners) return mergedListeners[name];
@@ -209,20 +218,27 @@ function mergeProps(...args) {
   const mergedListeners = {
     ...cachedListeners
   };
-  const mergedStyles = reduce(cacheStyles, 'style', combineStyle);
-  const mergedRefs = reverseChain(cacheRefs);
-  const mergedClasses = reduce(cacheClasses, 'class', (a, b) => `${a} ${b}`);
-  const mergedClassList = reduce(cacheClassList, 'classList', (a, b) => ({
-    ...a,
-    ...b
-  }));
+  const localMerged = {
+    get style() {
+      return reduce(cacheStyles, 'style', combineStyle);
+    },
+    get ref() {
+      return reverseChain(cacheRefs);
+    },
+    get class() {
+      return reduce(cacheClasses, 'class', (a, b) => `${a} ${b}`);
+    },
+    get classList() {
+      return reduce(cacheClassList, 'classList', (a, b) => ({
+        ...a,
+        ...b
+      }));
+    }
+  };
   return new Proxy({
     get(key) {
       if (typeof key !== 'string') return Reflect.get(merge, key);
-      if (key === 'style') return mergedStyles;
-      if (key === 'ref') return mergedRefs;
-      if (key === 'class') return mergedClasses;
-      if (key === 'classList') return mergedClassList;
+      if (key in localMerged) return localMerged[key];
       if (key[0] === 'o' && key[1] === 'n' && key[2]) {
         const name = key.toLowerCase();
         if (name in mergedListeners) return mergedListeners[name];

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * @msviderok/base-ui-solid v1.0.0-beta.2
+ * @msviderok/base-ui-solid v1.0.0-beta.8
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/esm/merge-props/mergeProps.js

@@ -124,23 +124,32 @@ export function mergeProps(...args) {
   for (let props of sources) {
     let propsOverride = false;
     if (typeof props === 'function') {
-      const mergedListeners = {
-        ...cachedListeners
+      const mergedListeners = Object.assign({}, cachedListeners);
+      const mergedStyles = Object.assign([], cacheStyles);
+      const mergedRefs = Object.assign([], cacheRefs);
+      const mergedClasses = Object.assign([], cacheClasses);
+      const mergedClassList = Object.assign([], cacheClassList);
+      const localMerged = {
+        get style() {
+          return reduce(mergedStyles, 'style', combineStyle);
+        },
+        get ref() {
+          return reverseChain(mergedRefs);
+        },
+        get class() {
+          return reduce(mergedClasses, 'class', (a, b) => `${a} ${b}`);
+        },
+        get classList() {
+          return reduce(mergedClassList, 'classList', (a, b) => ({
+            ...a,
+            ...b
+          }));
+        }
       };
-      const mergedStyles = reduce(cacheStyles, 'style', combineStyle);
-      const mergedRefs = reverseChain(cacheRefs);
-      const mergedClasses = reduce(cacheClasses, 'class', (a, b) => `${a} ${b}`);
-      const mergedClassList = reduce(cacheClassList, 'classList', (a, b) => ({
-        ...a,
-        ...b
-      }));
       const mergedForGetter = new Proxy(merge, {
         get(target, key, receiver) {
           if (typeof key !== 'string') return Reflect.get(target, key, receiver);
-          if (key === 'style') return mergedStyles;
-          if (key === 'ref') return mergedRefs;
-          if (key === 'class') return mergedClasses;
-          if (key === 'classList') return mergedClassList;
+          if (key in localMerged) return localMerged[key];
           if (key[0] === 'o' && key[1] === 'n' && key[2]) {
             const name = key.toLowerCase();
             if (name in mergedListeners) return mergedListeners[name];
@@ -200,20 +209,27 @@ export function mergeProps(...args) {
   const mergedListeners = {
     ...cachedListeners
   };
-  const mergedStyles = reduce(cacheStyles, 'style', combineStyle);
-  const mergedRefs = reverseChain(cacheRefs);
-  const mergedClasses = reduce(cacheClasses, 'class', (a, b) => `${a} ${b}`);
-  const mergedClassList = reduce(cacheClassList, 'classList', (a, b) => ({
-    ...a,
-    ...b
-  }));
+  const localMerged = {
+    get style() {
+      return reduce(cacheStyles, 'style', combineStyle);
+    },
+    get ref() {
+      return reverseChain(cacheRefs);
+    },
+    get class() {
+      return reduce(cacheClasses, 'class', (a, b) => `${a} ${b}`);
+    },
+    get classList() {
+      return reduce(cacheClassList, 'classList', (a, b) => ({
+        ...a,
+        ...b
+      }));
+    }
+  };
   return new Proxy({
     get(key) {
       if (typeof key !== 'string') return Reflect.get(merge, key);
-      if (key === 'style') return mergedStyles;
-      if (key === 'ref') return mergedRefs;
-      if (key === 'class') return mergedClasses;
-      if (key === 'classList') return mergedClassList;
+      if (key in localMerged) return localMerged[key];
       if (key[0] === 'o' && key[1] === 'n' && key[2]) {
         const name = key.toLowerCase();
         if (name in mergedListeners) return mergedListeners[name];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@msviderok/base-ui-solid",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.8",
   "private": false,
   "author": "MUI Team",
   "description": "Base UI is a library of headless ('unstyled') Solid components and low-level hooks. You gain complete control over your app's CSS and accessibility features.",
@@ -13,12 +13,12 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/sviderock/base-ui.git",
+    "url": "git+https://github.com/msviderok/base-ui.git",
     "directory": "packages/solid"
   },
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/sviderock/base-ui/issues"
+    "url": "https://github.com/msviderok/base-ui/issues"
   },
   "homepage": "https://base-ui.com",
   "funding": {
@@ -30,6 +30,7 @@
     "@babel/runtime": "^7.27.6",
     "@floating-ui/dom": "^1.7.2",
     "@floating-ui/utils": "^0.2.10",
+    "@solid-primitives/props": "^3.2.2",
     "@solidjs/router": "^0.15.3",
     "babel-preset-solid": "^1.9.10",
     "tabbable": "^6.2.0"
@@ -42,9 +43,6 @@
     "node": ">=14.0.0"
   },
   "main": "./cjs/index.js",
-  "directories": {
-    "test": "test"
-  },
   "module": "./esm/index.js",
   "types": "index",
   "typesVersions": {
@@ -439,6 +437,16 @@
         "default": "./esm/unstable-use-media-query/index.js"
       }
     },
+    "./use-render": {
+      "require": {
+        "types": "./cjs/use-render/index.d.ts",
+        "default": "./cjs/use-render/index.js"
+      },
+      "import": {
+        "types": "./esm/use-render/index.d.ts",
+        "default": "./esm/use-render/index.js"
+      }
+    },
     "./utils": {
       "require": {
         "types": "./cjs/utils/index.d.ts",