Repository navigation
Commit ce806b1
authored
Layout blocks and block frames (preview) (#3059)
* refactor(core): simplify the BlockInfo API into the single vocabulary for block plumbing
Replaces the BlockInfo union's isBlockContainer/childContainer/blockContent
shape with block/content/children, and annotates it with the facts callers
kept re-deriving by hand: contentStart/contentEnd, childrenStart/
childrenEnd, contentKind (read off the spec config stored on the node), and
isContentEmpty. The +1/-1 position arithmetic around content edges, tables
and child ranges moves into blockEdgePos/blockEdgeSelection/
tableContentCaretPos and the ChildrenInfo fields.
The six producers collapse to four named by the input you already have:
getBlockInfoFromNode, getBlockInfoAt, getBlockInfoNearPos,
getBlockInfoFromSelection. Block navigation (parent/prev/next/last-
descendant) joins them here instead of living beside the merge command.
All block manipulation (insert/move/nest/replace/split/update, selections,
clipboard, serialization, conversions, keyboard shortcuts) is rewired onto
the new vocabulary. insertBlocks gains "first-child"/"last-child"
placements resolved through getInsertionPos, shared with the move commands
so "can this block go here?" has one schema-driven answer; hand-written
nodes are checked against their declared content kind when the schema is
built (checkNodeMatchesConfig).
* refactor(core): consolidate BlockInfo shape and insertion helpers
Resolve block shape directly, validate wrapper structure at the BlockInfo boundary, and convert content from the established content kind. Move insertion resolution into BlockInfo and use node bounds for last-descendant navigation, updating callers and regression coverage.
* feat(container-blocks): unify containers, owned children, and frames
Build container ownership and editing on the BlockInfo helpers. Keep repair policy centralized, use the existing NodeView lifecycle for JS and React frames, and expose shared helpers through the core entrypoint.
* test(container-blocks): cover editing, frames, repair, and serialization
* docs(container-blocks): document the API and add panel and callout examples
* refactor(core): simplify container UI and block DOM lookup
* refactor(container-blocks): simplify rendering, editing, and exports
* fix(core): normalize container parsing and export
* fix(tests): streamline Docker build inputs and cache invalidation
* fix(container-blocks): simplify editing and support plain text
* refactor(container-blocks): simplify implementation and examples
* fix(core): complete frame lifecycle and preserve split children
* fix: address container block review feedback
* fix(core): unwrap a dissolving container in place (#3104)
* test(core): add behaviour tests for the built-in toggle blocks
Tests for the toggle heading and the toggle list item, covering the
toggle bugs under BLO-1018 and the rest of their editing behaviour. Every
test runs for both blocks.
The expected behaviour is Notion's (compared on 2026-09-29), with one
exception: a toggle heading turned into a regular heading keeps its
children nested. Tests for behaviour that BlockNote does not have yet use
`it.fails`, so they fail once it is implemented and must then be changed
to `it`:
- Enter at the end of an open toggle's title adds a first child (BLO-929)
- Enter mid-title moves the rest of the title into a first child (BLO-949)
- Enter on an empty last child adds another child
- Backspace at the start of the first child merges into the title
(fixed by #3124)
- the toggle stays open when its last child is removed or moved out
- Enter in an empty toggle heading makes a regular heading
- Mod-Alt-2 and the slash menu turn a toggle heading into a regular
heading (BLO-959)
- ArrowDown moves out of an open, empty toggle (BLO-956)
- a block dropped into an open, empty toggle becomes its child (BLO-956)
Keyboard and open-state tests are browser unit tests next to the toggle
code. Drag and drop, the side menu and the placeholder need the full
editor view, so they are end-to-end tests.
* refactor(core): draw the built-in toggles with renderFrame
The toggle heading and the toggle list item now draw their chevron and
"Add block" button with `renderFrame` (`createToggleFrame`), instead of
wrapping their content with `createToggleWrapper`. `render` draws only the
heading or paragraph.
- The toggle logic goes from about 200 to about 100 lines: the frame's
`update` hook replaces an editor-wide `onChange` listener per toggle,
and `ignoreMutation`, `destroy` and the listener clean-up go away.
- A heading that is not toggleable gets no frame.
- ArrowDown now moves the caret out of an open, empty toggle (BLO-956):
the "Add block" button no longer sits inside the content element.
- The frame keeps the `bn-toggle-wrapper` class and `data-show-children`,
so existing CSS and the internal HTML export still find it.
A frame moves `.bn-block-content` one level down, and `Block.css` selects
it as a direct child of `.bn-block` in many places. Heading sizes and the
block colours that also apply to a block's children therefore get a
second selector for the toggle frame. The chevron rotation now applies
only to a toggle's own chevron, so a closed toggle nested in an open one
keeps its chevron.
`createToggleWrapper` and the React `ToggleWrapper` stay, because custom
blocks use them.
* feat(core)!: split keyboard behaviour from container structure
Blocks declare how the keyboard treats them with a `keyboard` option on
their implementation (Enter, Shift-Enter, reset, empty-child Enter,
outdenting), instead of deriving it from a `children` config. A container is
marked with `container: true`; `children` only restricts its child types or
count, and defaults to `{ allow: "blocks" }` for every block.
- List items and toggles declare their Enter behaviour as settings; the
per-block list Enter handlers and the unused ListItemKeyboardShortcuts
file are removed.
- Enter at the start of a non-empty block inserts an empty block above, so
the block keeps its id, props and children (#550).
- Toggles: Enter on an open toggle goes into its children, a closed toggle
keeps them; the chevron has an accessible name and `aria-expanded`, which
also drives the CSS (replaces `data-show-children`).
- A toggle heading turned into a regular heading by the shortcut, the
markdown rule or the slash menu stops being a toggle.
- Backspace after a block whose own content is not rich text (a code block)
merges into its last child block.
- Removes `createToggleWrapper`, the React `ToggleWrapper` and the
toggleable-blocks example; `meta.hardBreakShortcut` is deprecated.
* feat(exporters): let block mappings place their children
A block mapping is a plain function (the exporter places the block's
children) or `{ withChildren }`, which receives the rendered children and
places them itself. A container with a plain mapping throws.
* fix(core): apply block colors to the children of framed blocks
The block's element (`.bn-block`) carries its text and background color, set
by the block container's node view and the internal HTML serializer. The
color rules in Block.css no longer look for the content as a direct child,
so they work when a frame puts the content at any depth, and the toggle
specific copies go away.
* test(server-util): update the full HTML snapshot for block color attributes
* fix: address review findings on keyboard settings and toggles
- Restore the toggle heading size and weight rules, which the block color
change dropped, and test that a toggle heading looks like a heading.
- Keep a keyboard setting's default when a keyboard function returns it as
`undefined`, instead of crashing Backspace.
- Resolve a block's keyboard settings against the document of the command
that asks.
- Tests: cover Shift-Enter on plain blocks with `keyboard` settings, remove
the per-exporter "unmapped block" tests (core tests the error) and a
duplicate Enter test, and update stale comments and names.
* docs(core): note that ignoreFrameChromeMutations needs tests or removal
* feat(core): drop a block into a toggle (BLO-956)
A block dragged onto a toggle's title, chevron or "Add block" button
becomes its first child, as in Notion. The drop cursor shows the place
and the toggle is highlighted like a selected block.
- `meta.dropsIntoChildren` marks a block that takes drops this way.
- The drop cursor finds the target and a `handleDrop` plugin drops the
blocks where the cursor shows them.
- Drag-and-drop events on frame chrome now reach ProseMirror.
- A toggle stays open when its last child is removed or moved out.
* fix(core): keep a block's id on Backspace below an alike empty block (#550)
Backspace at the start of a block below an empty block with the same type
and props moves the block up into its place: it keeps its id, props and
children. Below an empty block of another type, the text still moves into
that block, which keeps its id, type and props (Notion, #3124). Delete at
the end of the empty block does the same.
Also: the placeholder extension sets its editor class through
ProseMirror's `attributes` prop instead of on `view.dom`. ProseMirror
flushed the outside change 20ms later, which could outlive the editor in
tests ("document is not defined").
* fix(core): drop as usual when the drop target is gone
`handleDrop` used the target from the last `dragover`. If the target
was removed in the meantime (e.g. by a collaborator), it threw halfway
through the move. It now looks up the target first and lets ProseMirror
drop the blocks when it is gone. The drop also clears the highlight.
* test: update block spec snapshot for meta.dropsIntoChildren
* fix: one source for the block types that the menus offer (BLO-990, BLO-1236)
The block type select filtered a fixed item list by prop names and types.
With `allowToggleHeadings: false` it showed no headings at all, and with
`levels` it still showed every heading level.
`getDefaultBlockTypeItems(editor)` (core) now returns the block types that
the schema supports, with their props: headings for the configured levels,
toggle headings only when the heading has `isToggleable`. The slash menu
and the block type select both use it, each in its own order.
Breaking: `blockTypeSelectItems(dict)` is now `blockTypeSelectItems(editor)`.
* refactor(core): rename the keyboard option to experimental_keyboard
The block implementation option for keyboard settings is now
`experimental_keyboard`. The API is still under discussion and may
change. The resolved settings on a schema spec stay at `keyboard`, and
the declared option is no longer kept on the spec.
* Simplify nestBlock's slice, restrict children.min to allow lists, drop isContainerConfig
- nestBlock: `sinkItem` opens its slice into the previous sibling and its block group only, never into the group's last child. Tab after a column list (or any container node) now nests the block instead of throwing. `insert` follows the open depth; the step is applied with `tr.step` again, since the schema cannot refuse it.
- `children.min` is only valid with an `allow` list. `{ allow: "blocks" }` cannot carry it; the type and `validateChildrenConfigs` enforce this. `min: 0` lets a container be empty.
- Remove `isContainerConfig`: it was a plain property check.
- Docs: trim the typst section on blocks that place their children; describe `insertBlocks` placements for all blocks; document the `children.min` rule.
- Cleanups: the mergeBlocks test asserts that children are lifted and the comment names `createChainableState`; `nodeToBlock` loop variable; `contentKind` doc; the Exporter's container check.
* Keyboard, children and drag fixes from the second review round
- Columns: Enter in an empty column block adds another block (`emptyChildEnter: "stay"`), as in Notion. Other containers keep the default, where an empty last block leaves the container.
- Split: the children of a split block follow the text after the caret into the new block again, as on `main`. The new keyboard setting `splitKeepsChildren` keeps them on the block. It defaults to `true` when Enter goes into the children, and closed toggles set it.
- `children.exclude` names the container types a container of any blocks does not hold. Columns exclude column lists, as on `main`. The content expression is built when the editor builds its ProseMirror schema, from the complete block specs.
- A block's `meta` is resolved once per spec (`resolveBlockMeta`), like its keyboard settings. `draggable` defaults to `false` for a named-only container, which can only live in its parent.
- Multi-column drop: dropping blocks onto a target they hold does nothing, instead of throwing `Block with ID ... not found` (a CI flake).
- Tests: Backspace at the start of a column's first block keeps the caret; column children; a browser test for the drop flake.
- Docs: keyboard settings, `children.exclude`, `meta.draggable`; no column example on the container page.
* Frame slot parsing, frames out of external HTML, one data-* attribute rule
- A framed block's internal HTML marks its slot (`data-frame-slot-todo`), and the `blockContainer` parse rule reads only that element. Chrome a frame draws outside the slot no longer parses back as a paragraph. TODO: containers mark the same region with `data-children-of`; use one marker once container boxes move into `renderFrame`.
- External HTML leaves out `renderFrame`: a frame is editor chrome. A block that wants a wrapper returns one from `toExternalHTML`, with `childrenDOM` for its children.
- The test schema's callout always draws its chrome (no `this.renderType` branch), and the framed alert draws the same chrome, so the format-conversion tests cover both.
- One implementation of the props to `data-*` attribute rule (`propsToDataAttributes`, `setDataAttributes`, `applyDataAttributes`), used by blocks, inline content, tables, containers and the React specs. No output changes.
- Remove `isControl` from the side menu: it made the handle depend on whether a container's chrome is an element or padding.
* Containers draw only renderFrame; render never returns a frame (#3182)
- A container (`container: true`) declares only `renderFrame`; `render` is not permitted (`validateRenderHooks`). Its frame root carries the block's attributes.
- `render` returns only the block's content. Both HTML serializers call `renderFrame` themselves (`renderFrameDOM`).
- A block exports its frame unless it has its own `toExternalHTML`, which replaces the content and the frame. The spec has `toExternalHTML` only when the author wrote one.
- External HTML treats containers like regular blocks: no `data-node-type`, `data-id` or slot marker; props stay as `data-*`. Columns get `parse` functions, so they still round-trip. A container's children are kept when its own export places them nowhere.
- One slot marker (`data-frame-slot`) and finder (`findFrameSlot`). A frame's `dom` is an `HTMLElement`. `renderFrame`'s context no longer has `blockContentDOMAttributes`.
- React: frames take `slotRef`; `toExternalHTML` gets `childrenRef` (like core's `childrenDOM`); a container renders through `FrameNodeView`.
- `createBlockSpecFromTiptapNode` drops the unused `container`, `children` and `placeable` options.
- Main's doc comment for `render`'s `update` hook is restored.
* Frame views: one node view path for vanilla and React frames (#3184)
One FrameView type for vanilla and React frames; BlockContainer's node view rebuilt from main's; whoever draws a frame stamps it; shared chrome rules (drag-and-drop and clipboard events go to ProseMirror); getBlockElementForNode for BlockPopover; containers never reuse another block's frame.
* Workaround: measure a React container by its frame root
A React container's node view `dom` is TipTap's wrapper, which has
`display: contents` and so no box. nodeDOM boxes, coordsAtPos at the
container's edges, posToDOMRect, the drop cursor, the selection box and
scrolling measured 0,0,0,0.
This is a workaround: the wrapper's getBoundingClientRect and
getClientRects measure the frame's root instead. Other measurements of
the wrapper (offsetTop, observers, scrollIntoView on it) stay wrong. The
correct fix makes the frame's root the node view `dom` (FIXME in code).
* test(exporters): rely on the shared test document for child placement
The shared test document has a column list, and every exporter maps
`column` and `columnList` with `{ withChildren }`. Its snapshot tests
already check that each exporter gives a block's children to the mapping
and does not place them after the block again. An exporter decides this
only from the mapping (`placesChildren`), so a custom container or a
titled block takes the same path. Remove the custom-block tests that
each exporter repeated, and say so in `shared/testDocument.ts`.
* fix(multi-column): throw when the drop target column is not in its column list
The drop target comes from the column list, so it is one of its columns. If findIndex misses it, the new column would go to an incorrect position without an error. From #3116.
* fix(core): drag previews of containers; dragged blocks keep their parent
- The drag preview copies each dragged block's DOM (`nodeDOM`) into a copy
of the element that holds them, without `display: contents`. Before, it
found the blocks by assuming two DOM levels per block, so a React
container (or a frame whose root is its slot) got an empty preview, and
a block in a React container a preview without a box.
- `dragStart` puts the type of the dragged blocks' parent in the drag
data, and every editor parses the blocks into it. Before, a block that
only its parent can hold (a `namedOnly` container, e.g. a step) was
wrapped in a new copy of the parent, in the same editor and in others.
- Tests: drag previews of a React container and of a block in it, and
moving a `namedOnly` container in its list and to another editor. The
drag helper is split into `startBlockDrag` and `dropDraggedBlock`.
* fix(core): clearer block config errors; reject an unnamed namedOnly block
- The errors of `validateChildrenConfigs` use the words of the docs, not
internals ("container node", "the same wrapper"), and start with
"Invalid config for block", because not all are about `children`.
- A `namedOnly` block that no `children.allow` list names is now an error
at schema creation. Before, the schema accepted it, but the editor could
not insert it anywhere.
* feat(examples): container block examples; children.dissolve (#3140)
Tabs and stepper examples on the renderFrame container API. Adds children.dissolve for containers with an allow list (tab sets and steppers keep empty tabs and steps). The core drag fixes found by these examples are in container-blocks/unified (9414458).
* refactor!: rename container blocks to layout blocks (`layoutOnly`)
The block config flag `container: true` is now `layoutOnly: true`, and
"container block" is "layout block" in the API, errors, docs, examples
and tests. A layout block has no content of its own, only child blocks.
"Container" also named the `blockContainer` node (the node of every other
block, stored in documents), and suggested any block that holds blocks,
like a titled callout.
- Exports: `isContainerNode` -> `isLayoutNode`, `fixContainer` ->
`fixLayoutBlock`, `isEmptyContainerChild` -> `isEmptyLayoutChild`,
`getAncestorContainers` -> `getAncestorLayoutBlocks`,
`applyContainerAttributes` -> `applyLayoutBlockAttributes`,
`stampContainerFrame` -> `stampLayoutFrame`; `removeAndInsertBlocks`
option `fixContainers` -> `fixLayoutBlocks`.
- CSS class `bn-container-node-view` -> `bn-frame-node-view` (it is on
every React frame).
- Docs page `container-blocks` -> `layout-blocks`; example
`09-container-block` -> `09-layout-block`.
- Kept: `blockContainer` (stored in documents) and the `childContainer`
node group (any node holding a block's children), explained in
`children.ts`.
The ProseMirror schema and all serialized output are unchanged.
* docs(examples): streamline the alert and panel examples
Replace the callout example with "Alert Block with Title and Body". It is
the minimal Alert example plus a body: the same code, except for
renderFrame, experimental_keyboard and the title row. The layout block docs
build on it. The panel example gets a neutral look. The alert examples link
to each other, and the minimal alert example loses its slash menu tags.
* small fix to stepper design
* docs: explain block frames in Custom Blocks; layoutOnly is a boolean
Custom Blocks gets a Block Frames section, built on the Alert with a title
and a body. Layout Blocks starts with what a layout block is, compares it
with a block with a frame, and links to the Tabs and Stepper examples,
which are now on the docs site.
layoutOnly is now a boolean. `true` still needs content: "none".
* fix: review findings for layout blocks
- removeBlocks repairs only the layout blocks that directly hold the
removed block. A block nested under a regular block in a column no
longer collapses the column list (regression vs main).
- updateBlock keeps the block id when it rebuilds the block.
- children.min must be a whole number that is 0 or more.
- Docs: exporting layout blocks ({ withChildren }), and a layout block's
renderFrame must not return null.
- Examples: the layout examples' slash items move to a "Layout" group
(no second "Basic blocks" group), the stepper README is correct
again, and the tabs and stepper examples are by yousefed.
* docs: layout blocks are a preview; simplify the comparison table
Layout Blocks starts with a preview note that asks for feedback. The
table with block frames now says which hooks are mandatory, and links
to all layout block examples.
---------
Co-authored-by: YousefED1 parent abf741c commit ce806b1
402 files changed
Lines changed: 20266 additions & 4586 deletions
File tree
- docs
- content/docs
- features
- custom-schemas
- export
- reference/editor
- examples
- 01-basic
- 01-minimal
- 02-block-objects
- 03-multi-column
- 04-default-blocks
- 05-removing-default-blocks
- 06-block-manipulation
- 07-selection-blocks
- 08-ariakit
- 09-shadcn
- 10-localization
- 11-custom-placeholder
- 12-multi-editor
- 13-custom-paste-handler
- 14-editor-scrollable
- 15-shadowdom
- 16-read-only-editor
- 17-no-trailing-block
- testing
- 02-backend
- 01-file-uploading
- 02-saving-loading
- 03-s3
- 04-rendering-static-documents
- 03-ui-components
- 01-ui-elements-remove
- 02-formatting-toolbar-buttons
- 03-formatting-toolbar-block-type-items
- src
- 11-uppy-file-panel
- 12-static-formatting-toolbar
- 13-custom-ui
- src
- 14-mobile-formatting-toolbar
- 15-advanced-tables
- 16-link-toolbar-buttons
- 17-advanced-tables-2
- 18-drag-n-drop
- 20-portal-elements
- 04-theming
- 01-theming-dom-attributes
- 02-changing-font
- 03-theming-css
- 04-theming-css-variables
- 05-theming-css-variables-code
- 06-code-block
- 07-custom-code-block
- 05-interoperability
- 01-converting-blocks-to-html
- 02-converting-blocks-from-html
- 03-converting-blocks-to-md
- 04-converting-blocks-from-md
- 05-converting-blocks-to-pdf
- 06-converting-blocks-to-docx
- 07-converting-blocks-to-odt
- 08-converting-blocks-to-react-email
- 09-blocks-to-html-static-render
- 10-static-html-render
- 11-converting-blocks-to-pdf-react-pdf-deprecated
- 06-custom-schema
- 01-alert-block
- 03-font-style
- 04-pdf-file-block
- 05-alert-block-full-ux
- src
- 06-toggleable-blocks
- src
- 07-configuring-blocks
- 08-non-editable-block
- 09-layout-block
- src
- 09-math-block
- src
- 10-diagram-block
- src
- 11-source-with-preview
- src
- 13-alert-block-with-title-and-body
- src
- 14-tabs-block
- src
- 15-stepper-block
- src
- draggable-inline-content
- react-custom-blocks
- react-custom-inline-content
- react-custom-styles
- 07-collaboration
- 01-partykit
- 02-liveblocks
- 03-y-sweet
- 04-electric-sql
- 05-comments
- 06-comments-with-sidebar
- 07-ghost-writer
- 08-forking
- 09-comments-testing
- 10-suggestion-multi-editor
- 11-versioning-yjs13
- 12-multi-doc-versioning
- 13-versioning-yjs14
- 14-suggestion-gallery
- 08-extensions
- 01-tiptap-arrow-conversion
- 02-versioning
- 09-ai
- 01-minimal
- 02-playground
- 04-with-collaboration
- 05-manual-execution
- 06-client-side-transport
- 07-server-persistence
- vanilla-js
- react-vanilla-custom-blocks
- react-vanilla-custom-inline-content
- react-vanilla-custom-styles
- packages
- core/src
- api
- blockManipulation
- commands
- insertBlocks
- mergeBlocks
- moveBlocks
- nestBlock
- replaceBlocks
- util
- splitBlock
- updateBlock
- layoutBlocks
- selections
- clipboard
- fromClipboard
- toClipboard
- exporters/html
- util
- nodeConversions
- blocks
- Heading
- ListItem
- BulletListItem
- CheckListItem
- NumberedListItem
- ToggleListItem
- Table
- ToggleWrapper
- utils
- editor
- managers
- ExtensionManager
- exporter
- extensions
- DropCursor
- Placeholder
- SideMenu
- SourceBlockWithPreview
- SuggestionMenu
- SyntaxHighlighting
- TableHandles
- tiptap-extensions/KeyboardShortcuts
- i18n/locales
- pm-nodes
- schema
- blocks
- inlineContent
- yjs/extensions
- dev-scripts/examples/template-react
- diagram-block/src/block
- math-block/src/block
- react
- src
- blocks
- SourceWithPreview/block
- ToggleWrapper
- components
- FilePanel/DefaultTabs
- FormattingToolbar/DefaultSelects
- Popovers
- editor
- schema
- @util
- server-util/src/context/__snapshots__
- xl-ai/src/api/formats/html-blocks
- xl-docx-exporter/src/docx
- defaultSchema
- xl-email-exporter/src/react-email
- defaultSchema
- xl-multi-column
- src
- blocks/Columns
- extensions
- ColumnResize
- DropCursor
- SuggestionMenu
- __snapshots__
- pm-nodes
- test
- commands
- __snapshots__
- util
- __snapshots__
- conversions/__snapshots__/multi-column/undefined
- extensions
- xl-odt-exporter/src/odt
- defaultSchema
- xl-pdf-exporter/src/react-pdf
- defaultSchema
- xl-typst-exporter/src
- __snapshots__
- defaultSchema
- playground/src
- tests/src
- end-to-end
- dragdrop
- exporters
- multicolumn
- toggleblocks
- unit
- core
- clipboard/copy
- __snapshots__/text
- html
- plain
- formatConversion
- export
- __snapshots__
- blocknoteHTML
- complex
- heading
- layoutBlock
- lists
- paragraph
- titledBlock
- html
- layoutBlock
- titledBlock
- markdown
- layoutBlock
- titledBlock
- nodes
- layoutBlock
- titledBlock
- parse
- __snapshots__/html
- schema/__snapshots__
- react
- formatConversion/export/__snapshots__/blocknoteHTML
- customParagraph
- simpleCustomParagraph
- utils
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
59 | 64 | | |
60 | 65 | | |
61 | 66 | | |
| |||
110 | 115 | | |
111 | 116 | | |
112 | 117 | | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
113 | 127 | | |
114 | 128 | | |
115 | 129 | | |
| |||
121 | 135 | | |
122 | 136 | | |
123 | 137 | | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
124 | 143 | | |
125 | 144 | | |
126 | 145 | | |
127 | 146 | | |
128 | | - | |
| 147 | + | |
| 148 | + | |
129 | 149 | | |
130 | 150 | | |
131 | 151 | | |
132 | 152 | | |
133 | 153 | | |
134 | 154 | | |
135 | 155 | | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
136 | 169 | | |
137 | | - | |
138 | 170 | | |
139 | 171 | | |
140 | 172 | | |
141 | 173 | | |
142 | 174 | | |
| 175 | + | |
143 | 176 | | |
144 | 177 | | |
145 | 178 | | |
| |||
153 | 186 | | |
154 | 187 | | |
155 | 188 | | |
156 | | - | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
157 | 194 | | |
158 | | - | |
| 195 | + | |
| 196 | + | |
159 | 197 | | |
160 | 198 | | |
161 | 199 | | |
| |||
171 | 209 | | |
172 | 210 | | |
173 | 211 | | |
174 | | - | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
175 | 227 | | |
176 | | - | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
177 | 233 | | |
178 | 234 | | |
179 | 235 | | |
| |||
185 | 241 | | |
186 | 242 | | |
187 | 243 | | |
| 244 | + | |
| 245 | + | |
188 | 246 | | |
189 | 247 | | |
190 | 248 | | |
| |||
257 | 315 | | |
258 | 316 | | |
259 | 317 | | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
0 commit comments