Code

Properly merge incoming props#1265

Code

Merged

RobinMalfait merged 7 commits intomaintailwindlabs/headlessui:mainfrom merge-incoming-propstailwindlabs/headlessui:merge-incoming-propsCopy head branch name to clipboardMar 22, 2022

+399-284

Commits

Commits on Mar 22, 2022

• rename inconsistent passThroughProps and passthroughProps to more

  Show description for 221be4a
  RobinMalfait

  committed
  221be4a

  Copy full SHA for 221be4a

• split props into propsWeControl and propsTheyControl

  Show description for 302f5e6
  RobinMalfait

  committed
  302f5e6

  Copy full SHA for 302f5e6

• update render API to accept propsWeControl and propsTheyControl

  RobinMalfait

  committed
  b86d2d2

  Copy full SHA for b86d2d2

• improve the merge logic

  Show description for a567a10
  RobinMalfait

  committed
  a567a10

  Copy full SHA for a567a10

• fix typo in tests

  RobinMalfait

  committed
  bbd597e

  Copy full SHA for bbd597e

• simplify naming

  Show description for 2665eaa
  RobinMalfait

  committed
  2665eaa

  Copy full SHA for 2665eaa

• update changelog

  RobinMalfait

  committed
  c3a6931

  Copy full SHA for c3a6931