Code

[DataGrid] Column spanning#4020

Code

Merged

cherniavskii merged 42 commits intomui:mastermui/mui-x:masterfrom cherniavskii:column-spanningcherniavskii/mui-x:column-spanningCopy head branch name to clipboardApr 12, 2022

+2,620-87

Commits

Commits on Mar 17, 2022

• implement column spanning

  cherniavskii

  committed
  e32e825

  Copy full SHA for e32e825

Commits on Mar 18, 2022

• pass aria-colspan to Cell directly

  cherniavskii

  committed
  bfda437

  Copy full SHA for bfda437

• perf: get rid of expensive Array.include

  cherniavskii

  committed
  1fc6eed

  Copy full SHA for 1fc6eed

• rename collapsedByColSpan

  cherniavskii

  committed
  44d3ae2

  Copy full SHA for 44d3ae2

• improve readability

  cherniavskii

  committed
  5e99ac6

  Copy full SHA for 5e99ac6

• perf: get rid of expensive Array.slice

  cherniavskii

  committed
  78bb8a4

  Copy full SHA for 78bb8a4

• rename column spanning api type

  cherniavskii

  committed
  bfd1ed1

  Copy full SHA for bfd1ed1

• get rid of Array.slice

  cherniavskii

  committed
  478718a

  Copy full SHA for 478718a

Commits on Mar 21, 2022

• fix jsdoc

  cherniavskii

  committed
  0f5551a

  Copy full SHA for 0f5551a

• do not use data-attributes to query cells for column resizing

  cherniavskii

  committed
  7f9806d

  Copy full SHA for 7f9806d

• Merge branch 'master' into column-spanning

  cherniavskii

  committed
  299693a

  Copy full SHA for 299693a

Commits on Mar 22, 2022

• Merge branch 'master' into column-spanning

  cherniavskii

  committed
  fcb3cfd

  Copy full SHA for fcb3cfd

• return early if colSpan === 1

  cherniavskii

  committed
  aa01afb

  Copy full SHA for aa01afb

• do not pass cellParams to calculateCellColSpan

  cherniavskii

  committed
  cb66205

  Copy full SHA for cb66205

• do not pass colSpan attribute to GridCell div element

  cherniavskii

  committed
  7b3b63c

  Copy full SHA for 7b3b63c

• update docs

  cherniavskii

  committed
  9bc8d89

  Copy full SHA for 9bc8d89

Commits on Mar 23, 2022

• use getFirstNonSpannedColumnToRender directly

  cherniavskii

  committed
  b03d63e

  Copy full SHA for b03d63e

• improve ColumnSpanningDerived demo

  cherniavskii

  committed
  aa8a2c8

  Copy full SHA for aa8a2c8

• Merge branch 'master' into column-spanning

  cherniavskii

  committed
  93f2c9c

  Copy full SHA for 93f2c9c

• update js demo

  cherniavskii

  committed
  f96fbb5

  Copy full SHA for f96fbb5

Commits on Mar 24, 2022

• update warning on colSpan in combination with other features

  cherniavskii

  committed
  dad062b

  Copy full SHA for dad062b

Commits on Mar 25, 2022

• Merge branch 'master' into column-spanning

  cherniavskii

  committed
  6d197d0

  Copy full SHA for 6d197d0

Commits on Apr 4, 2022

• Merge branch 'master' into column-spanning

  cherniavskii

  committed
  9a6b959

  Copy full SHA for 9a6b959

• build api docs

  cherniavskii

  committed
  b142999

  Copy full SHA for b142999

• make break slot empty

  cherniavskii

  committed
  a53c5e2

  Copy full SHA for a53c5e2

• remove console logs

  cherniavskii

  committed
  d25aeda

  Copy full SHA for d25aeda

• add failing unit test

  cherniavskii

  committed
  43e2020

  Copy full SHA for 43e2020

• fix failing test

  cherniavskii

  committed
  ac54ad3

  Copy full SHA for ac54ad3

Commits on Apr 11, 2022

• Merge branch 'master' into column-spanning

  cherniavskii

  committed
  fe1246f

  Copy full SHA for fe1246f

• use generics in colSpan

  cherniavskii

  committed
  d3d0aff

  Copy full SHA for d3d0aff

• fix ts errors

  cherniavskii

  committed
  af9f0e3

  Copy full SHA for af9f0e3

• build api docs

  cherniavskii

  committed
  9311848

  Copy full SHA for 9311848

• update feature comparison

  cherniavskii

  committed
  ab689f2

  Copy full SHA for ab689f2

• Merge branch 'master' into column-spanning

  cherniavskii

  committed
  d0928f0

  Copy full SHA for d0928f0

• update docs

  cherniavskii

  committed
  52819bd

  Copy full SHA for 52819bd

• update docs

  cherniavskii

  committed
  6cb1a46

  Copy full SHA for 6cb1a46

• Merge branch 'master' into column-spanning

  cherniavskii

  committed
  dd2c728

  Copy full SHA for dd2c728

• disable some features in colSpan demos

  cherniavskii

  committed
  2236beb

  Copy full SHA for 2236beb

• code review fixes

  cherniavskii

  committed
  d9b8565

  Copy full SHA for d9b8565

• reuse rowId variable

  cherniavskii

  committed
  b782aeb

  Copy full SHA for b782aeb

• get rid of document.activeElement in tests

  cherniavskii

  committed
  b5e50d1

  Copy full SHA for b5e50d1

• Merge branch 'master' into column-spanning

  cherniavskii

  committed
  919cffb

  Copy full SHA for 919cffb