@startupjs-ui/div 0.3.0 → 0.3.4

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.3.4](https://github.com/startupjs/startupjs-ui/compare/v0.3.3...v0.3.4) (2026-06-18)
+
+
+### Features
+
+* **div, span:** supportTextNodes auto-wrap on Div + pure mode on Span ([#35](https://github.com/startupjs/startupjs-ui/issues/35)) ([d7bf159](https://github.com/startupjs/startupjs-ui/commit/d7bf159e73060a2531f2a1d66ec1932e9ddc3e6f))
+
+
+
+
+
+## [0.3.1](https://github.com/startupjs/startupjs-ui/compare/v0.3.0...v0.3.1) (2026-06-08)
+
+
+### Features
+
+* support inherited text styles from Div, support relative lineHeight ([#32](https://github.com/startupjs/startupjs-ui/issues/32)) ([47b56ab](https://github.com/startupjs/startupjs-ui/commit/47b56abca03b1d3ef1d977309deffd95a2de709d))
+
+
+
+
+
 # [0.3.0](https://github.com/startupjs/startupjs-ui/compare/v0.2.3...v0.3.0) (2026-05-27)
 
 

package/index.d.ts

@@ -19,6 +19,13 @@ export interface DivProps extends Omit<ViewProps, 'role'> {
     style?: StyleProp<ViewStyle>;
     /** Content rendered inside Div */
     children?: ReactNode;
+    /** Auto-wrap bare text children. When true, runs of consecutive string/number
+     * children (including those inside arrays/fragments) are each wrapped into a
+     * single text node so they render correctly in a non-text container. @default false */
+    supportTextNodes?: boolean;
+    /** How to render an auto-wrapped text run (only used with supportTextNodes).
+     * Receives the merged text; should return a text element. Defaults to <Span/>. */
+    renderTextNode?: (text: string) => ReactNode;
     /** Visual feedback variant @default 'opacity' */
     variant?: 'opacity' | 'highlight';
     /** Render children in a horizontal row */

package/index.tsx

@@ -1,4 +1,4 @@
-import { useLayoutEffect, useState, useRef, type ReactNode, type RefObject } from 'react'
+import { Children, cloneElement, createElement, Fragment, isValidElement, useContext, useLayoutEffect, useMemo, useState, useRef, type ReactNode, type RefObject } from 'react'
 import {
   View,
   Pressable,
@@ -11,6 +11,13 @@ import {
 import Animated from 'react-native-reanimated'
 import { pug, observer, u, useDidUpdate } from 'startupjs'
 import { colorToRGBA, getCssVariable, themed, type UIRole } from '@startupjs-ui/core'
+import {
+  TextStyleContext,
+  getInheritedTextStyle,
+  mergeInheritedTextStyles,
+  omitInheritedTextStyle
+} from '@startupjs-ui/span/textStyleContext'
+import Span from '@startupjs-ui/span'
 import { useDecorateTooltipProps } from './useTooltip'
 import STYLES from './index.cssx.styl'
 
@@ -45,6 +52,13 @@ export interface DivProps extends Omit<ViewProps, 'role'> {
   style?: StyleProp<ViewStyle>
   /** Content rendered inside Div */
   children?: ReactNode
+  /** Auto-wrap bare text children. When true, runs of consecutive string/number
+   * children (including those inside arrays/fragments) are each wrapped into a
+   * single text node so they render correctly in a non-text container. @default false */
+  supportTextNodes?: boolean
+  /** How to render an auto-wrapped text run (only used with supportTextNodes).
+   * Receives the merged text; should return a text element. Defaults to <Span/>. */
+  renderTextNode?: (text: string) => ReactNode
   /** Visual feedback variant @default 'opacity' */
   variant?: 'opacity' | 'highlight'
   /** Render children in a horizontal row */
@@ -98,8 +112,10 @@ export interface DivProps extends Omit<ViewProps, 'role'> {
 }
 
 function Div ({
-  style = [],
+  style: rawStyle = [],
   children,
+  supportTextNodes = false,
+  renderTextNode,
   variant = 'opacity',
   row,
   wrap,
@@ -125,9 +141,20 @@ function Div ({
   ...props
 }: DivProps): ReactNode {
   assertDeprecatedValues({ pushed, renderTooltip })
-  style = StyleSheet.flatten(style)
+  const renderedChildren = supportTextNodes ? wrapTextChildren(children, renderTextNode) : children
+  let style = StyleSheet.flatten(rawStyle) as ViewStyle | undefined
   // on RN row-reverse switches margins and paddings sides, so we switch them back
   if (isNative && reverse) style = reverseMarginPaddingSides(style)
+
+  const inheritedTextStyle = useContext(TextStyleContext)
+  const ownTextStyle = getInheritedTextStyle(style)
+  const nextInheritedTextStyleKey = simpleNumericHash(JSON.stringify([inheritedTextStyle, ownTextStyle]))
+  const nextInheritedTextStyle = useMemo(() => {
+    if (!ownTextStyle) return undefined
+    return mergeInheritedTextStyles(inheritedTextStyle, ownTextStyle)
+  }, [nextInheritedTextStyleKey]) // eslint-disable-line react-hooks/exhaustive-deps
+  omitInheritedTextStyle(style)
+
   if (gap === true) gap = 2
   const isPressable = hasPressHandler(props)
   const fallbackRef = useRef<any>(null)
@@ -214,15 +241,50 @@ function Div ({
       ]
       accessible=accessible
       ...renderProps
-    )= children
+    )= renderedChildren
   `
+  const styledDivElement = nextInheritedTextStyle
+    ? pug`
+      TextStyleContext.Provider(value=nextInheritedTextStyle)
+        = divElement
+    `
+    : divElement
 
   if (tooltipElement) {
     return pug`
-      = divElement
+      = styledDivElement
       = tooltipElement
     `
-  } else return divElement
+  } else return styledDivElement
+}
+
+// Auto-wrap bare text so it renders in a non-text container. Each maximal run of
+// consecutive string/number children is merged into one text node (so 'a {x} b'
+// becomes one line, not three stacked nodes); element children break a run;
+// fragments are traversed inline; arrays are already flattened by React.Children.
+function wrapTextChildren (children: ReactNode, renderTextNode?: (text: string) => ReactNode): ReactNode {
+  const out: ReactNode[] = []
+  let run = ''
+  let key = 0
+  const flush = () => {
+    if (run === '') return
+    const text = run
+    run = ''
+    const node = renderTextNode ? renderTextNode(text) : createElement(Span, null, text)
+    out.push(isValidElement(node) ? cloneElement(node, { key: `__t${key++}` }) : node)
+  }
+  const walk = (nodes: ReactNode) => {
+    Children.forEach(nodes, child => {
+      if (child == null || typeof child === 'boolean') return
+      if (typeof child === 'string' || typeof child === 'number') { run += String(child); return }
+      if (isValidElement(child) && child.type === Fragment) { walk((child.props as { children?: ReactNode }).children); return }
+      flush()
+      out.push(isValidElement(child) && child.key == null ? cloneElement(child, { key: `__e${key++}` }) : child)
+    })
+  }
+  walk(children)
+  flush()
+  return out
 }
 
 function isWebOnlyRole (role: unknown): role is Exclude<UIRole, ViewProps['role']> {
@@ -436,8 +498,8 @@ function hasPressHandler (props: Record<string, any>): boolean {
   return PRESSABLE_PROPS.some(prop => props[prop])
 }
 
-function reverseMarginPaddingSides (style: StyleProp<ViewStyle>) {
-  style = StyleSheet.flatten(style)
+function reverseMarginPaddingSides (style: ViewStyle | undefined): ViewStyle | undefined {
+  if (!style) return style
   const { paddingLeft, paddingRight, marginLeft, marginRight } = style
   style.marginLeft = marginRight
   style.marginRight = marginLeft
@@ -446,6 +508,12 @@ function reverseMarginPaddingSides (style: StyleProp<ViewStyle>) {
   return style
 }
 
+function simpleNumericHash (s: string): number {
+  let h = 0
+  for (let i = 0; i < s.length; i++) h = Math.imul(31, h) + s.charCodeAt(i) | 0
+  return h
+}
+
 function assertDeprecatedValues ({ pushed, renderTooltip }: { pushed?: any, renderTooltip?: any }) {
   if (DEPRECATED_PUSHED_VALUES.includes(pushed)) console.warn(ERRORS.DEPRECATED_PUSHED(pushed))
   if (renderTooltip) console.warn(ERRORS.DEPRECATED_RENDER_TOOLTIP)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startupjs-ui/div",
-  "version": "0.3.0",
+  "version": "0.3.4",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,7 @@
   "dependencies": {
     "@startupjs-ui/abstract-popover": "^0.3.0",
     "@startupjs-ui/core": "^0.3.0",
-    "@startupjs-ui/span": "^0.3.0"
+    "@startupjs-ui/span": "^0.3.4"
   },
   "peerDependencies": {
     "react": "*",
@@ -22,5 +22,5 @@
     "react-native-reanimated": ">=4.0.0",
     "startupjs": "*"
   },
-  "gitHead": "8d212b47680af1dfe582f9759b38724b46488e25"
+  "gitHead": "ad84ad14d189280a9ce4618b3223093fd09ba60e"
 }