chore: revert

Author: sadmann7

docs/package.json

@@ -15,7 +15,6 @@
   "dependencies": {
     "@diceui/checkbox-group": "workspace:*",
     "@diceui/combobox": "workspace:*",
-    "@diceui/masonry": "workspace:*",
     "@diceui/mention": "workspace:*",
     "@diceui/tags-input": "workspace:*",
     "@dnd-kit/core": "^6.3.1",

docs/registry/default/ui/kanban.tsx

@@ -154,12 +154,12 @@ const ITEM_HANDLE_NAME = "KanbanItemHandle";
 const OVERLAY_NAME = "KanbanOverlay";
 
 const KANBAN_ERROR = {
-  [ROOT_NAME]: `${ROOT_NAME} components must be within ${ROOT_NAME}`,
-  [BOARD_NAME]: `${BOARD_NAME} must be within ${ROOT_NAME}`,
-  [COLUMN_NAME]: `${COLUMN_NAME} must be within ${BOARD_NAME}`,
-  [ITEM_NAME]: `${ITEM_NAME} must be within ${COLUMN_NAME}`,
-  [ITEM_HANDLE_NAME]: `${ITEM_HANDLE_NAME} must be within ${ITEM_NAME}`,
-  [OVERLAY_NAME]: `${OVERLAY_NAME} must be within ${ROOT_NAME}`,
+  [ROOT_NAME]: `\`${ROOT_NAME}\` components must be within \`${ROOT_NAME}\``,
+  [BOARD_NAME]: `\`${BOARD_NAME}\` must be within \`${ROOT_NAME}\``,
+  [COLUMN_NAME]: `\`${COLUMN_NAME}\` must be within \`${BOARD_NAME}\``,
+  [ITEM_NAME]: `\`${ITEM_NAME}\` must be within \`${COLUMN_NAME}\``,
+  [ITEM_HANDLE_NAME]: `\`${ITEM_HANDLE_NAME}\` must be within \`${ITEM_NAME}\``,
+  [OVERLAY_NAME]: `\`${OVERLAY_NAME}\` must be within \`${ROOT_NAME}\``,
 } as const;
 
 interface KanbanContextValue<T> {

docs/registry/default/ui/sortable.tsx

@@ -66,11 +66,11 @@ const ITEM_HANDLE_NAME = "SortableItemHandle";
 const OVERLAY_NAME = "SortableOverlay";
 
 const SORTABLE_ERROR = {
-  [ROOT_NAME]: `${ROOT_NAME} components must be within ${ROOT_NAME}`,
-  [CONTENT_NAME]: `${CONTENT_NAME} must be within ${ROOT_NAME}`,
-  [ITEM_NAME]: `${ITEM_NAME} must be within ${CONTENT_NAME}`,
-  [ITEM_HANDLE_NAME]: `${ITEM_HANDLE_NAME} must be within ${ITEM_NAME}`,
-  [OVERLAY_NAME]: `${OVERLAY_NAME} must be within ${ROOT_NAME}`,
+  [ROOT_NAME]: `\`${ROOT_NAME}\` components must be within \`${ROOT_NAME}\``,
+  [CONTENT_NAME]: `\`${CONTENT_NAME}\` must be within \`${ROOT_NAME}\``,
+  [ITEM_NAME]: `\`${ITEM_NAME}\` must be within \`${CONTENT_NAME}\``,
+  [ITEM_HANDLE_NAME]: `\`${ITEM_HANDLE_NAME}\` must be within \`${ITEM_NAME}\``,
+  [OVERLAY_NAME]: `\`${OVERLAY_NAME}\` must be within \`${ROOT_NAME}\``,
 } as const;
 
 interface SortableRootContextValue<T> {

packages/combobox/src/combobox-item.tsx

@@ -52,8 +52,8 @@ const ComboboxItem = React.forwardRef<ItemElement, ComboboxItemProps>(
   (props, forwardedRef) => {
     const { value, label: labelProp, disabled, ...itemProps } = props;
     const context = useComboboxContext(ITEM_NAME);
-    // Make the group context optional by passing false, so item can be used outside of a group
-    const groupContext = useComboboxGroupContext(ITEM_NAME, false);
+    // Make the group context optional by passing true, so item can be used outside of a group
+    const groupContext = useComboboxGroupContext(ITEM_NAME, true);
     const { label, onLabelChange } = useLabel<ItemTextElement>({
       defaultValue: labelProp,
     });

packages/masonry/README.md

@@ -32,30 +32,30 @@ function createContext<T extends object | null>(
 
   Provider.displayName = `${rootComponentName}Provider`;
 
-  type ContextReturn<Required extends boolean> = Required extends true
-    ? T
-    : T | undefined;
+  type ContextReturn<Optional extends boolean> = Optional extends true
+    ? T | undefined
+    : T;
 
   /**
    * @param consumerName The name of the component that is consuming the context
-   * @param required Whether the context is required
+   * @param optional Whether the context is optional (defaults to false)
    */
-  function useContext<Required extends boolean = true>(
+  function useContext<Optional extends boolean = false>(
     consumerName: string,
-    required?: Required,
-  ): ContextReturn<Required> {
+    optional?: Optional,
+  ): ContextReturn<Optional> {
     const context = React.useContext(Context);
 
-    if (context) return context;
-    if (defaultValue !== undefined) return defaultValue;
-
-    if (required) {
+    if (!context && !optional) {
       throw new Error(
         `\`${consumerName}\` must be used within \`${rootComponentName}\``,
       );
     }
 
-    return undefined as ContextReturn<Required>;
+    if (context) return context;
+    if (defaultValue !== undefined) return defaultValue;
+
+    return undefined as ContextReturn<Optional>;
   }
 
   return [Provider, useContext] as const;