From 8c65dd4b5d44746cc7fc9789c780abdcaa474efa Mon Sep 17 00:00:00 2001
From: Vordgi <sasha2822222@gmail.com>
Date: Tue, 15 Oct 2024 22:09:30 +0400
Subject: [PATCH 1/4] rd-314 install next

---
 packages/robindoc/package.json |   2 +
 pnpm-lock.yaml                 | 215 +++++++++++++++++++++++++++++++++
 2 files changed, 217 insertions(+)

diff --git a/packages/robindoc/package.json b/packages/robindoc/package.json
index eacf40ae..5b5bf09d 100644
--- a/packages/robindoc/package.json
+++ b/packages/robindoc/package.json
@@ -43,6 +43,7 @@
     "@types/node": "20.12.11",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
+    "next": "14.2.15",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "rollup": "4.24.0",
@@ -54,6 +55,7 @@
     "typescript-transform-paths": "3.5.1"
   },
   "peerDependencies": {
+    "next": ">= 13.0.0",
     "react": ">= 18.3.0",
     "react-dom": ">= 18.3.0"
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9cc588e8..ad1db51c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -75,6 +75,9 @@ importers:
       '@types/react-dom':
         specifier: 18.3.0
         version: 18.3.0
+      next:
+        specifier: 14.2.15
+        version: 14.2.15(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.8)
       react:
         specifier: 18.3.1
         version: 18.3.1
@@ -161,6 +164,63 @@ packages:
   '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
 
+  '@next/env@14.2.15':
+    resolution: {integrity: sha512-S1qaj25Wru2dUpcIZMjxeMVSwkt8BK4dmWHHiBuRstcIyOsMapqT4A4jSB6onvqeygkSSmOkyny9VVx8JIGamQ==}
+
+  '@next/swc-darwin-arm64@14.2.15':
+    resolution: {integrity: sha512-Rvh7KU9hOUBnZ9TJ28n2Oa7dD9cvDBKua9IKx7cfQQ0GoYUwg9ig31O2oMwH3wm+pE3IkAQ67ZobPfEgurPZIA==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@next/swc-darwin-x64@14.2.15':
+    resolution: {integrity: sha512-5TGyjFcf8ampZP3e+FyCax5zFVHi+Oe7sZyaKOngsqyaNEpOgkKB3sqmymkZfowy3ufGA/tUgDPPxpQx931lHg==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@next/swc-linux-arm64-gnu@14.2.15':
+    resolution: {integrity: sha512-3Bwv4oc08ONiQ3FiOLKT72Q+ndEMyLNsc/D3qnLMbtUYTQAmkx9E/JRu0DBpHxNddBmNT5hxz1mYBphJ3mfrrw==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@next/swc-linux-arm64-musl@14.2.15':
+    resolution: {integrity: sha512-k5xf/tg1FBv/M4CMd8S+JL3uV9BnnRmoe7F+GWC3DxkTCD9aewFRH1s5rJ1zkzDa+Do4zyN8qD0N8c84Hu96FQ==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@next/swc-linux-x64-gnu@14.2.15':
+    resolution: {integrity: sha512-kE6q38hbrRbKEkkVn62reLXhThLRh6/TvgSP56GkFNhU22TbIrQDEMrO7j0IcQHcew2wfykq8lZyHFabz0oBrA==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@next/swc-linux-x64-musl@14.2.15':
+    resolution: {integrity: sha512-PZ5YE9ouy/IdO7QVJeIcyLn/Rc4ml9M2G4y3kCM9MNf1YKvFY4heg3pVa/jQbMro+tP6yc4G2o9LjAz1zxD7tQ==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [linux]
+
+  '@next/swc-win32-arm64-msvc@14.2.15':
+    resolution: {integrity: sha512-2raR16703kBvYEQD9HNLyb0/394yfqzmIeyp2nDzcPV4yPjqNUG3ohX6jX00WryXz6s1FXpVhsCo3i+g4RUX+g==}
+    engines: {node: '>= 10'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@next/swc-win32-ia32-msvc@14.2.15':
+    resolution: {integrity: sha512-fyTE8cklgkyR1p03kJa5zXEaZ9El+kDNM5A+66+8evQS5e/6v0Gk28LqA0Jet8gKSOyP+OTm/tJHzMlGdQerdQ==}
+    engines: {node: '>= 10'}
+    cpu: [ia32]
+    os: [win32]
+
+  '@next/swc-win32-x64-msvc@14.2.15':
+    resolution: {integrity: sha512-SzqGbsLsP9OwKNUG9nekShTwhj6JSB9ZLMWQ8g1gG6hdE5gQLncbnbymrwy2yVmH9nikSLYRYxYMFu78Ggp7/g==}
+    engines: {node: '>= 10'}
+    cpu: [x64]
+    os: [win32]
+
   '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -316,6 +376,12 @@ packages:
   '@shikijs/vscode-textmate@9.2.2':
     resolution: {integrity: sha512-TMp15K+GGYrWlZM8+Lnj9EaHEFmOen0WJBrfa17hF7taDOYthuPPV0GWzfd/9iMij0akS/8Yw2ikquH7uVi/fg==}
 
+  '@swc/counter@0.1.3':
+    resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
+
+  '@swc/helpers@0.5.5':
+    resolution: {integrity: sha512-KGYxvIOXcceOAbEk4bi/dVLEK9z8sZ0uBB3Il5b1rhfClSpcX0yfRO0KmTkqR2cnQDymwLB+25ZyMzICg/cm/A==}
+
   '@types/eslint@9.6.0':
     resolution: {integrity: sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==}
 
@@ -479,10 +545,17 @@ packages:
   buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
+  busboy@1.6.0:
+    resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
+    engines: {node: '>=10.16.0'}
+
   callsites@3.1.0:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
+  caniuse-lite@1.0.30001668:
+    resolution: {integrity: sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==}
+
   ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
 
@@ -500,6 +573,9 @@ packages:
     resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
     engines: {node: '>= 8.10.0'}
 
+  client-only@0.0.1:
+    resolution: {integrity: sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==}
+
   clsx@2.1.1:
     resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
     engines: {node: '>=6'}
@@ -748,6 +824,9 @@ packages:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
     engines: {node: '>=10'}
 
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
   graphemer@1.4.0:
     resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
 
@@ -973,9 +1052,32 @@ packages:
   ms@2.1.2:
     resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
 
+  nanoid@3.3.7:
+    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
   natural-compare@1.4.0:
     resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
+  next@14.2.15:
+    resolution: {integrity: sha512-h9ctmOokpoDphRvMGnwOJAedT6zKhwqyZML9mDtspgf4Rh3Pn7UTYKqePNoDvhsWBAO5GoPNYshnAUGIazVGmw==}
+    engines: {node: '>=18.17.0'}
+    hasBin: true
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+      '@playwright/test': ^1.41.2
+      react: ^18.2.0
+      react-dom: ^18.2.0
+      sass: ^1.3.0
+    peerDependenciesMeta:
+      '@opentelemetry/api':
+        optional: true
+      '@playwright/test':
+        optional: true
+      sass:
+        optional: true
+
   normalize-path@3.0.0:
     resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
     engines: {node: '>=0.10.0'}
@@ -1032,10 +1134,17 @@ packages:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
 
+  picocolors@1.1.0:
+    resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==}
+
   picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
+  postcss@8.4.31:
+    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
+    engines: {node: ^10 || ^12 || >=14}
+
   prelude-ls@1.2.1:
     resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
     engines: {node: '>= 0.8.0'}
@@ -1179,6 +1288,10 @@ packages:
   sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
+  streamsearch@1.1.0:
+    resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
+    engines: {node: '>=10.0.0'}
+
   string-width@4.2.3:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
@@ -1212,6 +1325,19 @@ packages:
   style-to-object@1.0.6:
     resolution: {integrity: sha512-khxq+Qm3xEyZfKd/y9L3oIWQimxuc4STrQKtQn8aSDRHb8mFgpukgX1hdzfrMEW6JCjyJ8p89x+IUMVnCBI1PA==}
 
+  styled-jsx@5.1.1:
+    resolution: {integrity: sha512-pW7uC1l4mBZ8ugbiZrcIsiIvVx1UmTfw7UkC3Um2tmfUq9Bhk8IiyEIPl6F8agHgjzku6j0xQEZbfA5uSgSaCw==}
+    engines: {node: '>= 12.0.0'}
+    peerDependencies:
+      '@babel/core': '*'
+      babel-plugin-macros: '*'
+      react: '>= 16.8.0 || 17.x.x || ^18.0.0-0'
+    peerDependenciesMeta:
+      '@babel/core':
+        optional: true
+      babel-plugin-macros:
+        optional: true
+
   supports-color@7.2.0:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
     engines: {node: '>=8'}
@@ -1406,6 +1532,35 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.0
 
+  '@next/env@14.2.15': {}
+
+  '@next/swc-darwin-arm64@14.2.15':
+    optional: true
+
+  '@next/swc-darwin-x64@14.2.15':
+    optional: true
+
+  '@next/swc-linux-arm64-gnu@14.2.15':
+    optional: true
+
+  '@next/swc-linux-arm64-musl@14.2.15':
+    optional: true
+
+  '@next/swc-linux-x64-gnu@14.2.15':
+    optional: true
+
+  '@next/swc-linux-x64-musl@14.2.15':
+    optional: true
+
+  '@next/swc-win32-arm64-msvc@14.2.15':
+    optional: true
+
+  '@next/swc-win32-ia32-msvc@14.2.15':
+    optional: true
+
+  '@next/swc-win32-x64-msvc@14.2.15':
+    optional: true
+
   '@nodelib/fs.scandir@2.1.5':
     dependencies:
       '@nodelib/fs.stat': 2.0.5
@@ -1534,6 +1689,13 @@ snapshots:
 
   '@shikijs/vscode-textmate@9.2.2': {}
 
+  '@swc/counter@0.1.3': {}
+
+  '@swc/helpers@0.5.5':
+    dependencies:
+      '@swc/counter': 0.1.3
+      tslib: 2.6.3
+
   '@types/eslint@9.6.0':
     dependencies:
       '@types/estree': 1.0.6
@@ -1718,8 +1880,14 @@ snapshots:
 
   buffer-from@1.1.2: {}
 
+  busboy@1.6.0:
+    dependencies:
+      streamsearch: 1.1.0
+
   callsites@3.1.0: {}
 
+  caniuse-lite@1.0.30001668: {}
+
   ccount@2.0.1: {}
 
   chalk@4.1.2:
@@ -1743,6 +1911,8 @@ snapshots:
     optionalDependencies:
       fsevents: 2.3.3
 
+  client-only@0.0.1: {}
+
   clsx@2.1.1: {}
 
   color-convert@2.0.1:
@@ -2020,6 +2190,8 @@ snapshots:
       merge2: 1.4.1
       slash: 3.0.0
 
+  graceful-fs@4.2.11: {}
+
   graphemer@1.4.0: {}
 
   gray-matter@4.0.3:
@@ -2245,8 +2417,36 @@ snapshots:
 
   ms@2.1.2: {}
 
+  nanoid@3.3.7: {}
+
   natural-compare@1.4.0: {}
 
+  next@14.2.15(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.77.8):
+    dependencies:
+      '@next/env': 14.2.15
+      '@swc/helpers': 0.5.5
+      busboy: 1.6.0
+      caniuse-lite: 1.0.30001668
+      graceful-fs: 4.2.11
+      postcss: 8.4.31
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      styled-jsx: 5.1.1(react@18.3.1)
+    optionalDependencies:
+      '@next/swc-darwin-arm64': 14.2.15
+      '@next/swc-darwin-x64': 14.2.15
+      '@next/swc-linux-arm64-gnu': 14.2.15
+      '@next/swc-linux-arm64-musl': 14.2.15
+      '@next/swc-linux-x64-gnu': 14.2.15
+      '@next/swc-linux-x64-musl': 14.2.15
+      '@next/swc-win32-arm64-msvc': 14.2.15
+      '@next/swc-win32-ia32-msvc': 14.2.15
+      '@next/swc-win32-x64-msvc': 14.2.15
+      sass: 1.77.8
+    transitivePeerDependencies:
+      - '@babel/core'
+      - babel-plugin-macros
+
   normalize-path@3.0.0: {}
 
   once@1.4.0:
@@ -2300,8 +2500,16 @@ snapshots:
 
   path-type@4.0.0: {}
 
+  picocolors@1.1.0: {}
+
   picomatch@2.3.1: {}
 
+  postcss@8.4.31:
+    dependencies:
+      nanoid: 3.3.7
+      picocolors: 1.1.0
+      source-map-js: 1.2.0
+
   prelude-ls@1.2.1: {}
 
   prettier-linter-helpers@1.0.0:
@@ -2448,6 +2656,8 @@ snapshots:
 
   sprintf-js@1.0.3: {}
 
+  streamsearch@1.1.0: {}
+
   string-width@4.2.3:
     dependencies:
       emoji-regex: 8.0.0
@@ -2485,6 +2695,11 @@ snapshots:
     dependencies:
       inline-style-parser: 0.2.3
 
+  styled-jsx@5.1.1(react@18.3.1):
+    dependencies:
+      client-only: 0.0.1
+      react: 18.3.1
+
   supports-color@7.2.0:
     dependencies:
       has-flag: 4.0.0

From 1b3539fc3db019513efa36551461f5e489ebb7a6 Mon Sep 17 00:00:00 2001
From: Vordgi <sasha2822222@gmail.com>
Date: Tue, 15 Oct 2024 22:10:09 +0400
Subject: [PATCH 2/4] rd-314 use next out of the box

---
 packages/robindoc/rollup.config.js            |  2 +
 .../components/blocks/breadcrumbs/index.tsx   |  5 +--
 .../blocks/nav-content-link/index.tsx         |  4 +-
 .../src/components/blocks/nav-link/index.tsx  |  7 ++--
 .../components/blocks/pagination/index.tsx    |  7 ++--
 .../src/components/blocks/search/index.tsx    |  4 +-
 .../blocks/search/search-modal/index.tsx      |  5 +--
 .../blocks/section-dropdown/index.tsx         |  4 +-
 .../components/contexts/sidebar/context.ts    |  3 --
 .../components/contexts/sidebar/provider.tsx  | 10 -----
 .../contexts/sidebar/use-sidebar-store.ts     | 26 -------------
 .../components/elements/article/document.tsx  |  5 +--
 .../src/components/elements/article/index.tsx |  9 +----
 .../src/components/elements/header/index.tsx  | 20 ++--------
 .../elements/robin-provider/index.tsx         |  5 +--
 .../src/components/elements/sidebar/index.tsx | 21 ++++------
 .../elements/sidebar/sidebar-drop/index.tsx   | 38 ++++++++-----------
 .../elements/sidebar/sidebar-link/index.tsx   | 15 ++++----
 .../src/components/elements/sidebar/tools.ts  | 16 ++++----
 .../src/components/ui/content-link/index.tsx  | 14 +++----
 .../src/core/utils/initialize-robindoc.tsx    | 12 ++----
 site/src/app/api/search/route.ts              |  2 +-
 site/src/app/docs/[[...path]]/page.tsx        |  5 +--
 site/src/app/docs/layout.tsx                  |  3 ++
 .../app/docs/{[[...path]] => }/robindoc.ts    |  0
 site/src/app/layout.tsx                       |  2 -
 site/src/app/sitemap.ts                       |  2 +-
 27 files changed, 75 insertions(+), 171 deletions(-)
 delete mode 100644 packages/robindoc/src/components/contexts/sidebar/context.ts
 delete mode 100644 packages/robindoc/src/components/contexts/sidebar/provider.tsx
 delete mode 100644 packages/robindoc/src/components/contexts/sidebar/use-sidebar-store.ts
 rename site/src/app/docs/{[[...path]] => }/robindoc.ts (100%)

diff --git a/packages/robindoc/rollup.config.js b/packages/robindoc/rollup.config.js
index b67386e3..d1469a70 100644
--- a/packages/robindoc/rollup.config.js
+++ b/packages/robindoc/rollup.config.js
@@ -19,6 +19,8 @@ module.exports = {
     external: [
         "react",
         "react-dom",
+        "next/link",
+        "next/navigation",
         "html-react-parser",
         "gray-matter",
         "marked",
diff --git a/packages/robindoc/src/components/blocks/breadcrumbs/index.tsx b/packages/robindoc/src/components/blocks/breadcrumbs/index.tsx
index 9eaa593b..ce7e9f15 100644
--- a/packages/robindoc/src/components/blocks/breadcrumbs/index.tsx
+++ b/packages/robindoc/src/components/blocks/breadcrumbs/index.tsx
@@ -8,15 +8,14 @@ import "./breadcrumbs.scss";
 export type BreadcrumbsProps = {
     title: string;
     breadcrumbs: BreadcrumbsType;
-    link?: React.ElementType;
 };
 
-export const Breadcrumbs: React.FC<BreadcrumbsProps> = async ({ title, breadcrumbs, link }) => {
+export const Breadcrumbs: React.FC<BreadcrumbsProps> = async ({ title, breadcrumbs }) => {
     return (
         <ul className="r-breadcrumbs">
             {breadcrumbs.map((breadcrumb) => (
                 <li key={breadcrumb.pathname} className="r-breadcrumb _previous">
-                    <NavLink link={link} href={breadcrumb.pathname} className="r-breadcrumb-link">
+                    <NavLink href={breadcrumb.pathname} className="r-breadcrumb-link">
                         {breadcrumb.title}
                     </NavLink>
                 </li>
diff --git a/packages/robindoc/src/components/blocks/nav-content-link/index.tsx b/packages/robindoc/src/components/blocks/nav-content-link/index.tsx
index 2f53585e..564352a8 100644
--- a/packages/robindoc/src/components/blocks/nav-content-link/index.tsx
+++ b/packages/robindoc/src/components/blocks/nav-content-link/index.tsx
@@ -5,9 +5,7 @@ import React from "react";
 import { useNavigate } from "@src/components/contexts/navigate/use-navigate";
 import { ContentLink, type ContentLinkProps } from "@src/components/ui/content-link";
 
-interface NavContentLinkProps extends ContentLinkProps {
-    link?: React.ElementType;
-}
+type NavContentLinkProps = ContentLinkProps;
 
 export const NavContentLink: React.FC<NavContentLinkProps> = ({ onClick, ...props }) => {
     const { listeners } = useNavigate();
diff --git a/packages/robindoc/src/components/blocks/nav-link/index.tsx b/packages/robindoc/src/components/blocks/nav-link/index.tsx
index 911b0ca1..c612adb4 100644
--- a/packages/robindoc/src/components/blocks/nav-link/index.tsx
+++ b/packages/robindoc/src/components/blocks/nav-link/index.tsx
@@ -1,14 +1,13 @@
 "use client";
 
 import React, { forwardRef } from "react";
+import Link, { LinkProps } from "next/link";
 
 import { useNavigate } from "@src/components/contexts/navigate/use-navigate";
 
-interface NavLinkProps extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
-    link?: React.ElementType;
-}
+type NavLinkProps = React.AnchorHTMLAttributes<HTMLAnchorElement> & React.PropsWithChildren<LinkProps>;
 
-export const NavLink = forwardRef<HTMLAnchorElement, NavLinkProps>(({ link: Link = "a", onClick, ...props }, ref) => {
+export const NavLink = forwardRef<HTMLAnchorElement, NavLinkProps>(({ onClick, ...props }, ref) => {
     const { listeners } = useNavigate();
 
     const clickHandler = (e: React.MouseEvent<HTMLAnchorElement>) => {
diff --git a/packages/robindoc/src/components/blocks/pagination/index.tsx b/packages/robindoc/src/components/blocks/pagination/index.tsx
index 5fe09ddf..eef51c3b 100644
--- a/packages/robindoc/src/components/blocks/pagination/index.tsx
+++ b/packages/robindoc/src/components/blocks/pagination/index.tsx
@@ -7,7 +7,6 @@ import "./pagination.scss";
 export type PaginationProps = {
     prev?: { title: string; pathname: string };
     next?: { title: string; pathname: string };
-    link?: React.ElementType;
     translations?: {
         /** Previous */
         previous?: string;
@@ -16,13 +15,13 @@ export type PaginationProps = {
     };
 };
 
-export const Pagination: React.FC<PaginationProps> = async ({ prev, next, link, translations }) => {
+export const Pagination: React.FC<PaginationProps> = async ({ prev, next, translations }) => {
     const { previous = "Previous", next: nextTranslation = "Next" } = translations || {};
 
     return (
         <div className="r-pagination">
             {prev ? (
-                <NavLink link={link} href={prev.pathname} className="r-pagination-item _prev">
+                <NavLink href={prev.pathname} className="r-pagination-item _prev">
                     <span className="r-pagination-icon _prev">
                         <svg
                             width="24"
@@ -47,7 +46,7 @@ export const Pagination: React.FC<PaginationProps> = async ({ prev, next, link,
                 <span />
             )}
             {next ? (
-                <NavLink link={link} href={next.pathname} className="r-pagination-item _next">
+                <NavLink href={next.pathname} className="r-pagination-item _next">
                     <span className="r-pagination-icon _next">
                         <svg
                             width="24"
diff --git a/packages/robindoc/src/components/blocks/search/index.tsx b/packages/robindoc/src/components/blocks/search/index.tsx
index efcf92c7..0bb609d8 100644
--- a/packages/robindoc/src/components/blocks/search/index.tsx
+++ b/packages/robindoc/src/components/blocks/search/index.tsx
@@ -10,7 +10,6 @@ import { KbdContainer, KbdKey } from "@src/components/ui/kbd";
 import { useModal } from "@src/components/ui/modal/use-modal";
 
 export interface SearchProps {
-    link?: React.ElementType;
     searcher: SearchModalProps["searcher"];
     translations?: {
         /** Search... */
@@ -18,7 +17,7 @@ export interface SearchProps {
     } & SearchModalProps["translations"];
 }
 
-export const Search: React.FC<SearchProps> = ({ link, searcher, translations }) => {
+export const Search: React.FC<SearchProps> = ({ searcher, translations }) => {
     const { search = "Search...", ...modalTranslations } = translations || {};
     const titleRef = useRef<HTMLSpanElement>(null);
     const { opened, closeHandler, openHandler } = useModal();
@@ -67,7 +66,6 @@ export const Search: React.FC<SearchProps> = ({ link, searcher, translations })
                 open={opened}
                 translations={modalTranslations}
                 searcher={searcher}
-                link={link}
                 onClose={closeHandler}
                 onInput={inputHandler}
             />
diff --git a/packages/robindoc/src/components/blocks/search/search-modal/index.tsx b/packages/robindoc/src/components/blocks/search/search-modal/index.tsx
index a480b0d4..2640a10f 100644
--- a/packages/robindoc/src/components/blocks/search/search-modal/index.tsx
+++ b/packages/robindoc/src/components/blocks/search/search-modal/index.tsx
@@ -11,7 +11,6 @@ import { Modal } from "@src/components/ui/modal";
 
 export interface SearchModalProps {
     onClose(): void;
-    link?: React.ElementType;
     open: boolean;
     onInput(text: string): void;
     searcher: Searcher | string;
@@ -23,7 +22,7 @@ export interface SearchModalProps {
     };
 }
 
-export const SearchModal: React.FC<SearchModalProps> = ({ translations, link, searcher, open, onClose, onInput }) => {
+export const SearchModal: React.FC<SearchModalProps> = ({ translations, searcher, open, onClose, onInput }) => {
     const { typeSomething = "Type something...", nothingFound = "Nothing found" } = translations || {};
     const inputRef = useRef<HTMLInputElement | null>(null);
     const [results, setResults] = useState<SearchItem[] | null>(null);
@@ -66,7 +65,7 @@ export const SearchModal: React.FC<SearchModalProps> = ({ translations, link, se
                     {results.length > 0 ? (
                         results.map((item) => (
                             <li key={item.href}>
-                                <NavLink link={link} href={item.href} onClick={onClose} className="r-search-item">
+                                <NavLink href={item.href} onClick={onClose} className="r-search-item">
                                     <p className="r-search-item-title">{item.title}</p>
                                     {item.description && <p className="r-search-item-desc">{item.description}</p>}
                                 </NavLink>
diff --git a/packages/robindoc/src/components/blocks/section-dropdown/index.tsx b/packages/robindoc/src/components/blocks/section-dropdown/index.tsx
index bafc4d28..26ebc64c 100644
--- a/packages/robindoc/src/components/blocks/section-dropdown/index.tsx
+++ b/packages/robindoc/src/components/blocks/section-dropdown/index.tsx
@@ -15,10 +15,9 @@ type SectionDropdownOption = {
 export type SectionDropdownProps = {
     defaultOption: string;
     options: SectionDropdownOption[];
-    link?: React.ElementType;
 };
 
-export const SectionDropdown: React.FC<SectionDropdownProps> = ({ defaultOption, options, link }) => {
+export const SectionDropdown: React.FC<SectionDropdownProps> = ({ defaultOption, options }) => {
     const defaultOptionDetailed = options.find((option) => option.key === defaultOption);
 
     if (!defaultOptionDetailed) {
@@ -47,7 +46,6 @@ export const SectionDropdown: React.FC<SectionDropdownProps> = ({ defaultOption,
                 {options.map((option) => (
                     <li key={option.key}>
                         <NavLink
-                            link={link}
                             href={option.href}
                             className={clsx("r-dropdown-link", option.key === defaultOption && "_active")}
                         >
diff --git a/packages/robindoc/src/components/contexts/sidebar/context.ts b/packages/robindoc/src/components/contexts/sidebar/context.ts
deleted file mode 100644
index 953503f8..00000000
--- a/packages/robindoc/src/components/contexts/sidebar/context.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { createContext } from "react";
-
-export const SidebarContext = createContext<string[]>([]);
diff --git a/packages/robindoc/src/components/contexts/sidebar/provider.tsx b/packages/robindoc/src/components/contexts/sidebar/provider.tsx
deleted file mode 100644
index 199c9476..00000000
--- a/packages/robindoc/src/components/contexts/sidebar/provider.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-"use client";
-
-import React, { useRef } from "react";
-import { SidebarContext } from "./context";
-
-export const SidebarProvider: React.FC<React.PropsWithChildren> = ({ children }) => {
-    const store = useRef<string[]>([]);
-
-    return <SidebarContext.Provider value={store.current}>{children}</SidebarContext.Provider>;
-};
diff --git a/packages/robindoc/src/components/contexts/sidebar/use-sidebar-store.ts b/packages/robindoc/src/components/contexts/sidebar/use-sidebar-store.ts
deleted file mode 100644
index 29d28d1a..00000000
--- a/packages/robindoc/src/components/contexts/sidebar/use-sidebar-store.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-"use client";
-
-import { useCallback, useContext } from "react";
-import { SidebarContext } from "./context";
-
-export const useSidebarStore = () => {
-    const openedSections = useContext(SidebarContext);
-
-    const add = useCallback((id: string) => {
-        if (!openedSections.includes(id)) {
-            openedSections.push(id);
-        }
-    }, []);
-
-    const remove = useCallback((id: string) => {
-        if (openedSections.includes(id)) {
-            openedSections.splice(openedSections.indexOf(id), 1);
-        }
-    }, []);
-
-    const has = useCallback((id: string) => {
-        return openedSections.includes(id);
-    }, []);
-
-    return { add, remove, has };
-};
diff --git a/packages/robindoc/src/components/elements/article/document.tsx b/packages/robindoc/src/components/elements/article/document.tsx
index 30b1f631..45d2aca0 100644
--- a/packages/robindoc/src/components/elements/article/document.tsx
+++ b/packages/robindoc/src/components/elements/article/document.tsx
@@ -73,7 +73,6 @@ export type ContentProps = {
     tokens: TokensList;
     headings: AnchorData[];
     subtree?: boolean;
-    link?: React.ElementType;
     pages?: { clientPath: string; origPath: string }[];
 };
 
@@ -86,7 +85,6 @@ export const Document: React.FC<ContentProps> = ({
     headings,
     config = {},
     subtree,
-    link,
     pages,
 }) => {
     const { publicDirs } = config;
@@ -207,7 +205,7 @@ export const Document: React.FC<ContentProps> = ({
                 }
 
                 return (
-                    <NavContentLink link={link} href={finalHref} external={external}>
+                    <NavContentLink href={finalHref} external={external}>
                         {token.tokens ? <DocumentToken token={token.tokens} /> : token.raw}
                     </NavContentLink>
                 );
@@ -336,7 +334,6 @@ export const Document: React.FC<ContentProps> = ({
                         raw={token.raw}
                         components={components}
                         config={config}
-                        link={link}
                         targetProvider={targetProvider}
                         pathname={pathname}
                         uri={uri}
diff --git a/packages/robindoc/src/components/elements/article/index.tsx b/packages/robindoc/src/components/elements/article/index.tsx
index 5ef1f1a9..5982fa57 100644
--- a/packages/robindoc/src/components/elements/article/index.tsx
+++ b/packages/robindoc/src/components/elements/article/index.tsx
@@ -19,7 +19,6 @@ export type ContentProps = {
         publicDirs?: string[];
     };
     provider?: BaseProvider;
-    link?: React.ElementType;
     pathname: string;
     pages?: { clientPath: string; origPath: string }[];
     translations?: {
@@ -40,7 +39,6 @@ export const Article: React.FC<ArticleProps> = async ({
     config = {},
     provider,
     hideContents,
-    link,
     editUri: editUriProp,
     pathname,
     title,
@@ -70,9 +68,7 @@ export const Article: React.FC<ArticleProps> = async ({
 
     return (
         <ContentsProvider>
-            {breadcrumbs && breadcrumbs.length > 0 && (
-                <Breadcrumbs breadcrumbs={breadcrumbs} title={title} link={link} />
-            )}
+            {breadcrumbs && breadcrumbs.length > 0 && <Breadcrumbs breadcrumbs={breadcrumbs} title={title} />}
             <Contents
                 editUri={editUriProp === null ? null : editUriProp || editUri}
                 hideContents={hideContents}
@@ -86,7 +82,6 @@ export const Article: React.FC<ArticleProps> = async ({
                     pages={pages}
                     components={components}
                     config={config}
-                    link={link}
                     targetProvider={targetProvider}
                     pathname={pathname}
                     uri={uri}
@@ -94,7 +89,7 @@ export const Article: React.FC<ArticleProps> = async ({
                 {lastModified && <LastModified date={lastModified}>{lastModifiedOn}</LastModified>}
             </div>
             {(prev || next) && (
-                <Pagination prev={prev} next={next} link={link} translations={{ next: nextTranslation, previous }} />
+                <Pagination prev={prev} next={next} translations={{ next: nextTranslation, previous }} />
             )}
         </ContentsProvider>
     );
diff --git a/packages/robindoc/src/components/elements/header/index.tsx b/packages/robindoc/src/components/elements/header/index.tsx
index b95756cc..5d590fb4 100644
--- a/packages/robindoc/src/components/elements/header/index.tsx
+++ b/packages/robindoc/src/components/elements/header/index.tsx
@@ -22,7 +22,6 @@ type SectionType = {
 
 export type HeaderProps = {
     logo: React.ReactElement;
-    link?: React.ElementType;
     links?: {
         title: string;
         href: string;
@@ -33,16 +32,7 @@ export type HeaderProps = {
 } & HeaderMenuProps &
     SearchProps;
 
-export const Header: React.FC<HeaderProps> = ({
-    logo,
-    versions,
-    locales,
-    link: Link = "a",
-    links = [],
-    git,
-    searcher,
-    translations,
-}) => {
+export const Header: React.FC<HeaderProps> = ({ logo, versions, locales, links = [], git, searcher, translations }) => {
     const { menu, ...searchTranslations } = translations || {};
     const targetVersion = versions?.list.find((version) => version.key === versions.target);
     const versionPrefix = !targetVersion || targetVersion.key === versions?.default ? "" : `/${targetVersion.key}`;
@@ -53,14 +43,14 @@ export const Header: React.FC<HeaderProps> = ({
         <header className="r-header">
             <Container className="r-header-body">
                 <div>
-                    <NavLink href="/" link={Link} className="r-header-logo">
+                    <NavLink href="/" className="r-header-logo">
                         {logo}
                     </NavLink>
                 </div>
                 <HeaderMenu translations={{ menu }}>
                     <nav className="r-header-nav">
                         {links.map((link) => (
-                            <NavLink href={link.href} link={Link} className="r-header-link" key={link.title}>
+                            <NavLink href={link.href} className="r-header-link" key={link.title}>
                                 {link.title}
                             </NavLink>
                         ))}
@@ -78,7 +68,6 @@ export const Header: React.FC<HeaderProps> = ({
                                         title: version.title,
                                         shortTitle: version.shortTitle,
                                     }))}
-                                    link={Link}
                                 />
                             )}
                             {locales && targetLocale && (
@@ -92,11 +81,10 @@ export const Header: React.FC<HeaderProps> = ({
                                         title: locale.title,
                                         shortTitle: locale.shortTitle,
                                     }))}
-                                    link={Link}
                                 />
                             )}
                         </div>
-                        {searcher && <Search link={Link} searcher={searcher} translations={searchTranslations} />}
+                        {searcher && <Search searcher={searcher} translations={searchTranslations} />}
                     </div>
                 </HeaderMenu>
                 {git && <HeaderSocial git={git} />}
diff --git a/packages/robindoc/src/components/elements/robin-provider/index.tsx b/packages/robindoc/src/components/elements/robin-provider/index.tsx
index 51981d0d..b87b5324 100644
--- a/packages/robindoc/src/components/elements/robin-provider/index.tsx
+++ b/packages/robindoc/src/components/elements/robin-provider/index.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 
 import { NavigateProvider } from "@src/components/contexts/navigate/provider";
-import { SidebarProvider } from "@src/components/contexts/sidebar/provider";
 
 const clientLogic = () => {
     const userTheme = localStorage.getItem("theme");
@@ -39,9 +38,7 @@ export const RobinProvider: React.FC<React.PropsWithChildren> = ({ children }) =
                     __html: `(${clientLogic})()`,
                 }}
             />
-            <SidebarProvider>
-                <NavigateProvider>{children}</NavigateProvider>
-            </SidebarProvider>
+            <NavigateProvider>{children}</NavigateProvider>
         </>
     );
 };
diff --git a/packages/robindoc/src/components/elements/sidebar/index.tsx b/packages/robindoc/src/components/elements/sidebar/index.tsx
index db4bfe05..c8f667f4 100644
--- a/packages/robindoc/src/components/elements/sidebar/index.tsx
+++ b/packages/robindoc/src/components/elements/sidebar/index.tsx
@@ -5,14 +5,12 @@ import { type TreeItem } from "./types";
 import { SidebarMenu } from "./sidebar-menu";
 import { SidebarDrop } from "./sidebar-drop";
 import { SidebarLink } from "./sidebar-link";
-import { checkIsTargetSection } from "./tools";
+import { collectItems, isActiveItem } from "./tools";
 
 import "./sidebar.scss";
 
 type LinkBranchProps = {
     branch: TreeItem;
-    link?: React.ElementType;
-    pathname?: string;
     depth: number;
     translations?: {
         /** Expand {title} */
@@ -20,7 +18,7 @@ type LinkBranchProps = {
     };
 };
 
-const LinkBranch: React.FC<LinkBranchProps> = ({ branch, link, pathname, depth, translations }) => {
+const LinkBranch: React.FC<LinkBranchProps> = ({ branch, depth, translations }) => {
     const { expandTitle = "Expand {title}" } = translations || {};
 
     return (
@@ -31,24 +29,23 @@ const LinkBranch: React.FC<LinkBranchProps> = ({ branch, link, pathname, depth,
                 branch.items && branch.items.length > 0 && "_droppable",
             )}
         >
-            {branch.href ? (
-                <SidebarLink link={link} branch={branch} pathname={pathname} />
+            {isActiveItem(branch) ? (
+                <SidebarLink branch={branch} />
             ) : (
                 <p className={clsx("r-sidebar-p", branch.type === "heading" && "r-sidebar-heading")}>{branch.title}</p>
             )}
             {branch.items && branch.items.length > 0 && (
                 <SidebarDrop
-                    defaultOpen={checkIsTargetSection(branch, pathname)}
+                    childHrefs={collectItems(branch)}
+                    defaultOpen={false}
                     id={branch.href + branch.title}
                     label={expandTitle.replace("{title}", branch.title)}
                 >
                     {branch.items.map((item) => (
                         <LinkBranch
                             branch={item}
-                            link={link}
                             key={item.href + item.title}
                             depth={depth >= 4 ? 4 : depth + 1}
-                            pathname={pathname}
                             translations={translations}
                         />
                     ))}
@@ -60,12 +57,10 @@ const LinkBranch: React.FC<LinkBranchProps> = ({ branch, link, pathname, depth,
 
 export type SidebarProps = {
     tree?: TreeItem[] | null;
-    link?: React.ElementType;
-    pathname?: string;
     translations?: LinkBranchProps["translations"];
 };
 
-export const Sidebar: React.FC<SidebarProps> = ({ tree, pathname, link, translations }) => {
+export const Sidebar: React.FC<SidebarProps> = ({ tree, translations }) => {
     if (!tree?.length) return <div className="r-sidebar" />;
 
     return (
@@ -76,9 +71,7 @@ export const Sidebar: React.FC<SidebarProps> = ({ tree, pathname, link, translat
                     <ul className="r-sidebar-list">
                         {tree.map((item) => (
                             <LinkBranch
-                                pathname={pathname?.replace(/\/$/, "")}
                                 branch={item}
-                                link={link}
                                 key={item.href + item.title}
                                 depth={0}
                                 translations={translations}
diff --git a/packages/robindoc/src/components/elements/sidebar/sidebar-drop/index.tsx b/packages/robindoc/src/components/elements/sidebar/sidebar-drop/index.tsx
index 22a0481f..f1c65a3d 100644
--- a/packages/robindoc/src/components/elements/sidebar/sidebar-drop/index.tsx
+++ b/packages/robindoc/src/components/elements/sidebar/sidebar-drop/index.tsx
@@ -1,41 +1,33 @@
 "use client";
 
-import React, { useEffect, useRef } from "react";
-import { useSidebarStore } from "@src/components/contexts/sidebar/use-sidebar-store";
+import React, { useEffect, useRef, useState } from "react";
+import { usePathname } from "next/navigation";
 
 export interface SidebarDropProps {
+    childHrefs: string[];
     defaultOpen?: boolean;
     label: string;
     id: string;
 }
 
-export const SidebarDrop: React.FC<React.PropsWithChildren<SidebarDropProps>> = ({
-    children,
-    id,
-    defaultOpen,
-    label,
-}) => {
-    const { add, remove, has } = useSidebarStore();
+export const SidebarDrop: React.FC<React.PropsWithChildren<SidebarDropProps>> = ({ childHrefs, label, children }) => {
+    const pathname = usePathname();
+    const openedByDefault = childHrefs.includes(pathname);
+    const [opened, setOpened] = useState(openedByDefault);
     const dropdownRef = useRef<HTMLUListElement>(null);
+    const detailsRef = useRef<HTMLDetailsElement>(null);
 
-    const toggleHandler = (e: React.MouseEvent<HTMLDetailsElement>) => {
-        if (e.currentTarget.open) {
-            e.currentTarget.style.removeProperty("--drop-height");
-            remove(id);
-        } else {
-            if (dropdownRef.current?.offsetHeight) {
-                e.currentTarget.style.setProperty("--drop-height", dropdownRef.current.offsetHeight.toString() + "px");
-            }
-            add(id);
-        }
-    };
+    useEffect(() => {
+        if (openedByDefault && !opened) setOpened(true);
+        if (openedByDefault && detailsRef.current && !detailsRef.current?.open) detailsRef.current.open = true;
+    }, [openedByDefault]);
 
     useEffect(() => {
-        if (defaultOpen) add(id);
-    }, [defaultOpen]);
+        detailsRef.current?.style.setProperty("--drop-height", dropdownRef.current?.offsetHeight.toString() + "px");
+    }, []);
 
     return (
-        <details className="r-sidebar-drop" open={has(id) || defaultOpen} onClick={toggleHandler}>
+        <details className="r-sidebar-drop" open={opened} ref={detailsRef}>
             <summary className="r-sidebar-drop-btn" aria-label={label}>
                 <svg
                     className="r-sidebar-drop-icon"
diff --git a/packages/robindoc/src/components/elements/sidebar/sidebar-link/index.tsx b/packages/robindoc/src/components/elements/sidebar/sidebar-link/index.tsx
index 8bbe6b1a..061588bb 100644
--- a/packages/robindoc/src/components/elements/sidebar/sidebar-link/index.tsx
+++ b/packages/robindoc/src/components/elements/sidebar/sidebar-link/index.tsx
@@ -1,26 +1,25 @@
 "use client";
 
 import React, { useRef } from "react";
+import { usePathname } from "next/navigation";
 import clsx from "clsx";
 
-import { type TreeItem } from "../types";
-import { checkIsTargetPathname, checkIsTargetSection } from "../tools";
 import { NavLink } from "@src/components/blocks/nav-link";
+import { type TreeItem } from "../types";
+import { checkIsTargetPathname, collectItems } from "../tools";
 
 type SidebarLinkProps = {
-    branch: TreeItem;
-    link?: React.ElementType;
-    pathname?: string;
+    branch: TreeItem & { href: string };
 };
 
-export const SidebarLink: React.FC<SidebarLinkProps> = ({ link, branch, pathname }) => {
+export const SidebarLink: React.FC<SidebarLinkProps> = ({ branch }) => {
+    const pathname = usePathname();
     const isActive = checkIsTargetPathname(branch.href, pathname);
-    const isTarget = checkIsTargetSection(branch, pathname);
+    const isTarget = collectItems(branch).includes(pathname);
     const scrollTimeoutRef = useRef<NodeJS.Timeout | null>(null);
 
     return (
         <NavLink
-            link={link}
             href={branch.href}
             className={clsx("r-sidebar-link", isActive && "_active", isTarget && "_target")}
             ref={(node) => {
diff --git a/packages/robindoc/src/components/elements/sidebar/tools.ts b/packages/robindoc/src/components/elements/sidebar/tools.ts
index 40b602a0..9f95b6c6 100644
--- a/packages/robindoc/src/components/elements/sidebar/tools.ts
+++ b/packages/robindoc/src/components/elements/sidebar/tools.ts
@@ -1,17 +1,19 @@
 import { type TreeItem } from "./types";
 
-export const checkIsTargetSection = (item: TreeItem, pathname?: string) => {
-    if (typeof pathname !== "string") return false;
+export const collectItems = (branch: TreeItem) => {
+    const links: string[] = [];
 
-    if (typeof item.href === "string" && pathname === new URL(item.href, "http://r").pathname?.replace(/\/$/, "")) {
-        return true;
-    }
+    if (branch.href) links.push(branch.href);
 
-    if (item.items?.find((el) => checkIsTargetSection(el, pathname))) return true;
+    branch.items?.forEach((item) => {
+        links.push(...collectItems(item));
+    });
 
-    return false;
+    return links;
 };
 
+export const isActiveItem = (branch: TreeItem): branch is TreeItem & { href: string } => Boolean(branch.href);
+
 export const checkIsTargetPathname = (itemHref?: string, pathname?: string) => {
     if (typeof pathname !== "string" || typeof itemHref !== "string") return false;
 
diff --git a/packages/robindoc/src/components/ui/content-link/index.tsx b/packages/robindoc/src/components/ui/content-link/index.tsx
index 214f6513..d9861c87 100644
--- a/packages/robindoc/src/components/ui/content-link/index.tsx
+++ b/packages/robindoc/src/components/ui/content-link/index.tsx
@@ -1,20 +1,16 @@
 import React from "react";
+import Link, { type LinkProps } from "next/link";
 import clsx from "clsx";
 
 import "./content-link.scss";
 
-export interface ContentLinkProps extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
-    link?: React.ElementType;
+export interface ContentLinkProps
+    extends Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, "href">,
+        React.PropsWithChildren<LinkProps> {
     external?: boolean;
 }
 
-export const ContentLink: React.FC<ContentLinkProps> = ({
-    link: Link = "a",
-    className,
-    external,
-    children,
-    ...props
-}) => {
+export const ContentLink: React.FC<ContentLinkProps> = ({ className, external, children, ...props }) => {
     const additionalProps = external ? { target: "_blank", rel: "noopener noreferrer" } : {};
     return (
         <Link className={clsx("r-content-link", className)} {...additionalProps} {...props}>
diff --git a/packages/robindoc/src/core/utils/initialize-robindoc.tsx b/packages/robindoc/src/core/utils/initialize-robindoc.tsx
index 2ae0ed59..7aa6a7d9 100644
--- a/packages/robindoc/src/core/utils/initialize-robindoc.tsx
+++ b/packages/robindoc/src/core/utils/initialize-robindoc.tsx
@@ -68,16 +68,10 @@ export const initializeRobindoc = (structureTemplate: Structure | (() => Structu
         );
     };
 
-    const Sidebar: React.FC<SidebarProps> = async ({ pathname, ...props }) => {
-        const { pages, tree } = await pageDataPromise;
-        const pathnameClean = normalizePathname(pathname);
-        const pageData = pages[pathnameClean];
-
-        if (!pageData) {
-            throw new Error(`Can not find data for "${pathnameClean}". Please check structure`);
-        }
+    const Sidebar: React.FC<SidebarProps> = async (props) => {
+        const { tree } = await pageDataPromise;
 
-        return <SidebarBase pathname={pathnameClean} tree={tree} {...props} />;
+        return <SidebarBase tree={tree} {...props} />;
     };
 
     const getPages = async (basePath?: string) => {
diff --git a/site/src/app/api/search/route.ts b/site/src/app/api/search/route.ts
index 38a3fd95..8f0d2687 100644
--- a/site/src/app/api/search/route.ts
+++ b/site/src/app/api/search/route.ts
@@ -1,5 +1,5 @@
 import { matchSorter } from 'match-sorter'
-import { getPages, getPageContent } from '../../docs/[[...path]]/robindoc';
+import { getPages, getPageContent } from '../../docs/robindoc';
 
 const headers = new Headers();
 headers.set('Content-Type', 'application/json; charset=UTF-8');
diff --git a/site/src/app/docs/[[...path]]/page.tsx b/site/src/app/docs/[[...path]]/page.tsx
index 5d3a4e7f..91d39c19 100644
--- a/site/src/app/docs/[[...path]]/page.tsx
+++ b/site/src/app/docs/[[...path]]/page.tsx
@@ -1,7 +1,6 @@
-import Link from "next/link";
 import { KeylinkToNavigation } from "robindoc";
 
-import { Page, Sidebar, getMeta, getPageData, getPages } from "./robindoc";
+import { Page, getMeta, getPageData, getPages } from "../robindoc";
 import { Note } from "../../../components/ui/note";
 import { PackageLinks } from "../../../components/ui/package-links";
 
@@ -11,10 +10,8 @@ const Docs = async ({ params }: { params: { path?: string[] } }) => {
 
     return (
         <>
-            <Sidebar pathname={path} link={Link} />
             <Page
                 pathname={path}
-                link={Link}
                 components={{
                     Note,
                     PackageLinks,
diff --git a/site/src/app/docs/layout.tsx b/site/src/app/docs/layout.tsx
index 7f019a7a..c0fd90ff 100644
--- a/site/src/app/docs/layout.tsx
+++ b/site/src/app/docs/layout.tsx
@@ -1,6 +1,8 @@
 import type { Metadata } from "next";
 import { Main } from 'robindoc';
 
+import { Sidebar } from "./robindoc";
+
 export const metadata: Metadata = {
     title: {
       template: '%s | Robindoc',
@@ -12,6 +14,7 @@ export const metadata: Metadata = {
 const DocsLayout = ({ children }: Readonly<{ children?: JSX.Element }>) => {
     return (
         <Main>
+            <Sidebar />
             {children}
         </Main>
     );
diff --git a/site/src/app/docs/[[...path]]/robindoc.ts b/site/src/app/docs/robindoc.ts
similarity index 100%
rename from site/src/app/docs/[[...path]]/robindoc.ts
rename to site/src/app/docs/robindoc.ts
diff --git a/site/src/app/layout.tsx b/site/src/app/layout.tsx
index 772af98f..455a24db 100644
--- a/site/src/app/layout.tsx
+++ b/site/src/app/layout.tsx
@@ -2,7 +2,6 @@ import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import { Analytics } from '@vercel/analytics/react';
 import { Header, Footer, RobinProvider, KeylinkToContent } from 'robindoc';
-import Link from "next/link";
 
 import { Logo } from "../components/ui/logo";
 
@@ -27,7 +26,6 @@ const RootLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => {
                             { href: '/docs', title: 'Docs' },
                             { href: '/showcase', title: 'Showcase' },
                         ]}
-                        link={Link}
                         logo={<Logo />}
                         git="https://github.com/vordgi/robindoc"
                         searcher="/api/search"
diff --git a/site/src/app/sitemap.ts b/site/src/app/sitemap.ts
index b38389fb..e93c8a63 100644
--- a/site/src/app/sitemap.ts
+++ b/site/src/app/sitemap.ts
@@ -1,5 +1,5 @@
 import { type MetadataRoute } from 'next';
-import { getPages } from './docs/[[...path]]/robindoc';
+import { getPages } from './docs/robindoc';
  
 export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
   const pages = await getPages();

From 3d581df0927d2792706f4a4eb5c30be8149d7d52 Mon Sep 17 00:00:00 2001
From: Vordgi <sasha2822222@gmail.com>
Date: Tue, 15 Oct 2024 22:40:59 +0400
Subject: [PATCH 3/4] rd-314 update docs

---
 README.md                                     |  6 +-
 docs/01-getting-started/01-installation.md    |  4 +-
 docs/01-getting-started/03-initialization.md  |  4 +-
 .../next-js.md => 04-app-organization.md}     | 65 +++++++++++--------
 .../04-app-organization/README.md             | 58 -----------------
 docs/01-getting-started/README.md             |  5 +-
 docs/02-structure/02-items.md                 | 10 +--
 docs/02-structure/03-data-source.md           |  6 +-
 docs/02-structure/README.md                   |  2 +-
 docs/03-customization/01-elements/README.md   |  8 +--
 docs/03-customization/01-elements/footer.md   |  2 +-
 docs/03-customization/01-elements/header.md   |  4 +-
 docs/03-customization/01-elements/keylinks.md | 22 ++++---
 docs/03-customization/01-elements/main.md     |  2 +-
 docs/03-customization/01-elements/page.md     | 23 +++----
 .../01-elements/robin-provider.md             |  2 +-
 docs/03-customization/01-elements/sidebar.md  | 22 +++----
 docs/03-customization/02-tools/README.md      |  4 +-
 docs/03-customization/02-tools/get-meta.md    |  4 +-
 .../02-tools/get-page-content.md              |  2 +-
 docs/03-customization/02-tools/get-pages.md   |  2 +-
 docs/03-customization/03-search.md            |  2 +-
 docs/03-customization/README.md               |  6 +-
 site/src/app/docs/[[...path]]/page.tsx        | 27 ++++----
 site/src/app/docs/layout.tsx                  |  3 +-
 .../components/sections/features/index.tsx    |  2 +-
 26 files changed, 119 insertions(+), 178 deletions(-)
 rename docs/01-getting-started/{04-app-organization/next-js.md => 04-app-organization.md} (63%)
 delete mode 100644 docs/01-getting-started/04-app-organization/README.md

diff --git a/README.md b/README.md
index 375b9217..f1e46a28 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Read the documentation in a convenient interface at [robindoc.com/docs](https://
 
 Robindoc is a framework for automatically creating documentation websites based on markdown files, built on React.js Server Components.
 
-```tsx
+```tsx filename="/docs/page.tsx"
 export const Documentation = () => {
   return (
     <RobinProvider>
@@ -34,8 +34,8 @@ No additional configuration is needed, while preserving the accessibility and cl
 
 ## Advantages
 
-- Works on React.js Server Components (RSC). The framework choice is up to you. More details in the section "[App Organization](./docs/01-getting-started/04-app-organization/README.md)";
-- Requires no configuration of the project, bundler, or markdown documents. More details in the section "[Customization](./docs/03-customization/README.md)";
+- Works on React.js Server Components (RSC). More details in the section "[App Organization](./docs/01-getting-started/04-app-organization.md)";
+- Zero configuration of the project, bundler, or markdown documents. More details in the section "[Customization](./docs/03-customization/README.md)";
 - Supports loading content from various sources, including GitHub. More details in the section "[Data Source](./docs/02-structure/03-data-source.md)";
 - Supports fully automatic documentation generation, as well as custom generation. More details in the section "[Structure](./docs/02-structure/README.md)";
 - Supports JSX/HTML and special Robin components for all sources. More details in the section "[Writing MD](./docs/01-getting-started/02-writing-md.md)";
diff --git a/docs/01-getting-started/01-installation.md b/docs/01-getting-started/01-installation.md
index 3e4c14c9..c3b54896 100644
--- a/docs/01-getting-started/01-installation.md
+++ b/docs/01-getting-started/01-installation.md
@@ -1,8 +1,6 @@
 # Installation
 
-Robindoc is simply a helper framework, meaning it does not include React itself or its frameworks. Additionally, Robindoc does not depend on any specific solutions.
-
-If you do not yet have an application, initialize it according to the instructions of the framework you are comfortable with (that supports RSC).
+Robindoc is simply a helper framework, meaning it does not include React itself or its frameworks. _If you do not yet have an application, initialize it according to the instructions._
 
 If you already have an application on a framework that supports RSC, simply install the `robindoc` package. After that, you can fully integrate it into your application by [initializing Robindoc](./03-initialization.md).
 
diff --git a/docs/01-getting-started/03-initialization.md b/docs/01-getting-started/03-initialization.md
index 51c05f2e..c6bbfe87 100644
--- a/docs/01-getting-started/03-initialization.md
+++ b/docs/01-getting-started/03-initialization.md
@@ -6,7 +6,7 @@ To use Robindoc with all its features, you need to initialize it. To do this, yo
 
 The method will return dynamic components [`Page`](../03-customization/01-elements/page.md) and [`Sidebar`](../03-customization/01-elements/sidebar.md), as well as the methods [`getPages`](../03-customization/02-tools/get-pages.md), [`getMeta`](../03-customization/02-tools/get-meta.md), and [`getPageContent`](../03-customization/02-tools/get-page-content.md).
 
-```ts
+```ts filename="/docs/robindoc.ts"
 import { initializeRobindoc } from "robindoc";
 
 export const { Page, Sidebar, getPages, getMeta, getPageContent } =
@@ -20,7 +20,7 @@ export const { Page, Sidebar, getPages, getMeta, getPageContent } =
   });
 ```
 
-Now, use these elements in the necessary places. For more details, read the "[App Organization](./04-app-organization/README.md)" section.
+Now, use these elements in the necessary places. For more details, read the "[App Organization](./04-app-organization.md)" section.
 
 ## File Location
 
diff --git a/docs/01-getting-started/04-app-organization/next-js.md b/docs/01-getting-started/04-app-organization.md
similarity index 63%
rename from docs/01-getting-started/04-app-organization/next-js.md
rename to docs/01-getting-started/04-app-organization.md
index aa18a740..d050b9fc 100644
--- a/docs/01-getting-started/04-app-organization/next-js.md
+++ b/docs/01-getting-started/04-app-organization.md
@@ -1,34 +1,49 @@
-# Application Organization for Next.js
+# App Organization
 
-Currently, Robindoc works only with the App Router. Once RSC is available for the Pages Router, Robindoc will automatically support it as well.
+Robindoc can be considered to consist of several parts:
+
+- Documentation Structure ([more about documentation structure](../../02-structure/README.md));
+- Robindoc Initialization ([more about initialization](../03-initialization.md));
+- Page Markup and Configuration ([more about customization](../../03-customization/README.md));
+- Documentation Markdown Files ([more about writing MD](../02-writing-md.md)).
+
+## Organizing Documentation Files
+
+One of the main advantages of Robindoc is that documentation files can reside in any source — whether they are files outside the current directory or a remote git repository (more about sources on the "[Data Source](../../02-structure/03-data-source.md)" page).
+
+Robindoc’s main approach is that you don’t adjust the location of markdown files for Robindoc; instead, Robindoc builds the site from your markdown files. In other words, you place files so that they can be read in GitHub, and Robindoc serves as a convenient interface.
+
+However, when using the automatic mode for generating the structure, the documentation file structure should match the desired structure on the site. In manual mode, you can organize the documentation files as you wish, but it is still recommended to reflect the site’s structure.
+
+## Application Setup and Configuration
 
 You can initialize Robindoc on any subpath of your site, as long as you specify the [`basePath`](../../02-structure/01-configuration.md) in the project initialization and pass the correct path in the Robindoc components.
 
+After initialization, you will receive Sidebar, Page, getPages, getMeta, and getPageContent. Read more on the [Initialization](../03-initialization.md) page.
+
+Global elements - [`RobinProvider`](../../03-customization/01-elements/robin-provider.md), [`Header`](../../03-customization/01-elements/header.md), [`Footer`](../../03-customization/01-elements/footer.md), [`Main`](../../03-customization/01-elements/main.md) and [`Sidebar`](../../03-customization/01-elements/sidebar.md) - should ideally be placed above all pages and reused across all.
+Currently, Robindoc works only with the App Router. Once RSC is available for the Pages Router, Robindoc will automatically support it as well.
+
 ## Page Setup
 
 Next.js supports dynamic routes, so it is recommended to set up one [dynamic segment](https://nextjs.org/docs/app/building-your-application/routing/dynamic-routes#optional-catch-all-segments) for all documentation pages.
 
 ```tsx filename="app/docs/[[...path]]/page.tsx"
-import { Page, Sidebar, getMeta, getPages } from "./robindoc";
+import { Page, Sidebar, getMeta, getPages } from "../robindoc";
 
 export const Page: React.FC<{ params: { path?: string[] } }> = ({ params }) => {
   const pathname = "/docs/" + (params.path?.join("/") || "");
 
-  return (
-    <>
-      <Sidebar pathname={pathname} />
-      <Page pathname={pathname} />
-    </>
-  );
+  return <Page pathname={pathname} />;
 };
 ```
 
-For more details about the props, refer to the [`Sidebar`](../../03-customization/01-elements/sidebar.md) and [`Page`](../../03-customization/01-elements/page.md) block pages.
+For more details about the props, refer to the [`Page`](../../03-customization/01-elements/page.md) element page.
 
 You should also set up metadata generation and static parameters generation (if you want to use SSG, which is highly recommended):
 
-```tsx
-import { Page, Sidebar, getMeta, getPages } from "./robindoc";
+```tsx filename="app/docs/[[...path]]/page.tsx"
+import { Page, Sidebar, getMeta, getPages } from "../robindoc";
 
 // ...
 
@@ -53,7 +68,7 @@ export const generateStaticParams = async () => {
 
 It is recommended to place the Robindoc initialization near this route.
 
-```tsx filename="app/docs/[[...path]]/robindoc.ts"
+```tsx filename="app/docs/robindoc.ts"
 import { initializeRobindoc } from "robindoc";
 
 export const { Page, Sidebar, getPages, getMeta, getPageContent } =
@@ -79,22 +94,26 @@ The Next.js Layout should be placed one level up so that it remains static for a
 
 ```tsx filename="app/docs/layout.tsx"
 import { RobinProvider, Header, Footer, Main } from "robindoc";
-import Link from "next/link";
+import { Sidebar } from "./robindoc";
 import Logo from "./logo";
+
 import "robindoc/lib/styles.css";
 
 export const Layout = ({ children }) => {
   return (
     <RobinProvider>
-      <Header logo={<Logo />} link={Link} />
-      <Main>{children}</Main>
+      <Header logo={<Logo />} />
+      <Main>
+        <Sidebar />
+        {children}
+      </Main>
       <Footer copyright="© 2024 All rights reserved" />
     </RobinProvider>
   );
 };
 ```
 
-For more details on configuring elements, refer to the [`RobinProvider`](../../03-customization/01-elements/robin-provider.md), [`Header`](../../03-customization/01-elements/header.md), [`Footer`](../../03-customization/01-elements/footer.md), and [`Main`](../../03-customization/01-elements/main.md) block pages.
+For more details on configuring elements, refer to the [`RobinProvider`](../../03-customization/01-elements/robin-provider.md), [`Header`](../../03-customization/01-elements/header.md), [`Sidebar`](../../03-customization/01-elements/sidebar.md), [`Footer`](../../03-customization/01-elements/footer.md), and [`Main`](../../03-customization/01-elements/main.md) block pages.
 
 ## Search Setup
 
@@ -117,28 +136,22 @@ export const GET = async (request: Request) => {
 ```
 
 ```tsx switcher filename="app/docs/layout.tsx" tab="TypeScript"
-import { Layout } from "robindoc";
-
 export const Layout = ({ children }) => {
   return (
     <RobinProvider>
       <Header logo={<Logo />} searcher="/api/search" />
-      <Main>{children}</Main>
-      <Footer copyright="© 2024 All rights reserved" />
+      {/* ... */}
     </RobinProvider>
   );
 };
 ```
 
 ```js switcher filename="app/docs/layout.js" tab="JavaScript"
-import { Layout } from "robindoc";
-
 export const Layout = ({ children }) => {
   return (
     <RobinProvider>
       <Header logo={<Logo />} searcher="/api/search" />
-      <Main>{children}</Main>
-      <Footer copyright="© 2024 All rights reserved" />
+      {/* ... */}
     </RobinProvider>
   );
 };
@@ -167,7 +180,7 @@ To generate a sitemap in next.js, you can use a [special sitemap file](https://n
 
 ```ts filename="./app/sitemap.ts"
 import { type MetadataRoute } from "next";
-import { getPages } from "./docs/[[...path]]/robindoc";
+import { getPages } from "./docs/robindoc";
 
 export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
   const pages = await getPages();
diff --git a/docs/01-getting-started/04-app-organization/README.md b/docs/01-getting-started/04-app-organization/README.md
deleted file mode 100644
index 52a0c2da..00000000
--- a/docs/01-getting-started/04-app-organization/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# App Organization
-
-Robindoc can be considered to consist of several parts:
-
-- Documentation Structure ([more about documentation structure](../../02-structure/README.md));
-- Robindoc Initialization ([more about initialization](../03-initialization.md));
-- Page Markup and Configuration ([more about customization](../../03-customization/README.md));
-- Documentation Markdown Files ([more about writing MD](../02-writing-md.md)).
-
-## Organizing Documentation Files
-
-One of the main advantages of Robindoc is that documentation files can reside in any source — whether they are files outside the current directory or a remote git repository (more about sources on the "[Data Source](../../02-structure/03-data-source.md)" page).
-
-Robindoc’s main approach is that you don’t adjust the location of markdown files for Robindoc; instead, Robindoc builds the site from your markdown files. In other words, you place files so that they can be read in GitHub, and Robindoc serves as a convenient interface.
-
-However, when using the automatic mode for generating the structure, the documentation file structure should match the desired structure on the site. In manual mode, you can organize the documentation files as you wish, but it is still recommended to reflect the site’s structure.
-
-## Application Setup and Configuration
-
-After initialization, you will receive Sidebar, Page, getPages, getMeta, and getPageContent. Read more on the [Initialization](../03-initialization.md) page.
-
-Global elements - [`RobinProvider`](../../03-customization/01-elements/robin-provider.md), [`Header`](../../03-customization/01-elements/header.md), [`Footer`](../../03-customization/01-elements/footer.md), and [`Main`](../../03-customization/01-elements/main.md) - should ideally be placed above all pages and reused across all.
-
-```tsx
-import { RobinProvider, Header, Footer, Main } from "robindoc";
-import "robindoc/lib/styles.css";
-
-export const Layout = ({ children }) => {
-  return (
-    <RobinProvider>
-      <Header logo={<Logo />} />
-      <Main>{children}</Main>
-      <Footer copyright="© 2024 All rights reserved" />
-    </RobinProvider>
-  );
-};
-```
-
-[Sidebar](../../03-customization/01-elements/sidebar.md) and [Page](../../03-customization/01-elements/page.md) are used for each page.
-
-```tsx
-import { Page, Sidebar } from "./robindoc";
-
-export const Page = () => {
-  return (
-    <>
-      <Sidebar pathname="/docs" />
-      <Page pathname="/docs" />
-    </>
-  );
-};
-```
-
-For more details on using the components, refer to their respective pages.
-
-You will also need to configure metadata insertion on pages, search, and possibly dynamic page generation. The specific markup of Robindoc components and configuration may vary depending on the chosen framework. Here are some ready-made solutions:
-
-- [Organizing a Next.js Application](./next-js.md)
diff --git a/docs/01-getting-started/README.md b/docs/01-getting-started/README.md
index faa43eb1..4cf6f0b2 100644
--- a/docs/01-getting-started/README.md
+++ b/docs/01-getting-started/README.md
@@ -6,8 +6,7 @@ To start using Robindoc, follow these steps:
 
 2. [Initialize Robindoc](./03-initialization.md);
 
-3. [Configure documentation pages for your framework](./04-app-organization/README.md)
-   - [Organizing an application with Next.js](./04-app-organization/next-js.md)
+3. [Configure documentation pages](./04-app-organization.md)
 
 ## Requirements
 
@@ -15,4 +14,4 @@ Node.js version 18.0.0 or later. It is recommended to use Node.js v20.0.0 or hig
 
 React.js version 19.0.0 (including experimental and canary channels) or later.
 
-A framework that supports React Server Components in its configuration.
+Next.js App Router.
diff --git a/docs/02-structure/02-items.md b/docs/02-structure/02-items.md
index a4f28483..6e961205 100644
--- a/docs/02-structure/02-items.md
+++ b/docs/02-structure/02-items.md
@@ -12,7 +12,7 @@ Each item consists of the following keys:
 
 Firstly, Robindoc reads the structure passed as an argument:
 
-```ts filename="robindoc.ts"
+```ts filename="/docs/robindoc.ts"
 export const { Page, Sidebar } = initializeRobindoc({
   // ...
   items: [
@@ -49,7 +49,7 @@ export const { Page, Sidebar } = initializeRobindoc({
 
 You can also pass an asynchronous callback as an argument. In this case, you can form the structure in a way that suits you.
 
-```ts filename="robindoc.ts"
+```ts filename="/docs/robindoc.ts"
 export const { Page, Sidebar } = initializeRobindoc(async () => {
   const items = await loadItems();
 
@@ -70,7 +70,7 @@ This configuration determines the list of available and generated pages, all lin
 
 To have the subtree generated automatically, you need to pass `items: 'auto'`.
 
-```ts filename="robindoc.ts"
+```ts filename="/docs/robindoc.ts"
 export const { Page, Sidebar } = initializeRobindoc({
   // ...
   items: "auto",
@@ -79,7 +79,7 @@ export const { Page, Sidebar } = initializeRobindoc({
 
 You can add extra elements from third-party sources to automatically generated elements - `items: [YOUR_OPTIONS, 'auto']`
 
-```ts filename="robindoc.ts"
+```ts filename="/docs/robindoc.ts"
 import { initializeRobindoc } from "robindoc";
 
 export const { Page, Sidebar } = initializeRobindoc({
@@ -103,7 +103,7 @@ export const { Page, Sidebar } = initializeRobindoc({
 
 This, like any configuration setting, can be done anywhere in the structure.
 
-```ts filename="robindoc.ts"
+```ts filename="/docs/robindoc.ts"
 export const { Page, Sidebar } = initializeRobindoc({
   // ...
   items: [
diff --git a/docs/02-structure/03-data-source.md b/docs/02-structure/03-data-source.md
index 33064b3c..149254ce 100644
--- a/docs/02-structure/03-data-source.md
+++ b/docs/02-structure/03-data-source.md
@@ -6,7 +6,7 @@ Currently, full support for the file system and GitHub is built-in. If you want
 
 By default, documentation is built from the current directory. To reconfigure Robindoc to another source, simply change the `sourceRoot` in the required branch of the structure ([learn more about structure configuration](./01-configuration.md)).
 
-```ts
+```ts filename="/docs/robindoc.ts"
 export const { Page, Sidebar } = initializeRobindoc(async () => ({
   configuration: {
     sourceRoot: "../docs",
@@ -27,7 +27,7 @@ In the case of a remote Git repository, you can specify URLs for individual bran
 
 You can generate a token at https://github.com/settings/tokens?type=beta. For private repositories it should have read-only access to `contents`.
 
-```ts
+```ts filename="/docs/robindoc.ts"
 import { initializeRobindoc } from "robindoc";
 
 export const { Page, Sidebar } = initializeRobindoc({
@@ -42,7 +42,7 @@ export const { Page, Sidebar } = initializeRobindoc({
 
 Robindoc can assemble the structure from different sources, for example, one section from a local system and another from a remote Git repository.
 
-```ts
+```ts filename="/docs/robindoc.ts"
 import { initializeRobindoc } from "robindoc";
 
 export const { Page, Sidebar } = initializeRobindoc({
diff --git a/docs/02-structure/README.md b/docs/02-structure/README.md
index 3b764a83..75d05732 100644
--- a/docs/02-structure/README.md
+++ b/docs/02-structure/README.md
@@ -2,7 +2,7 @@
 
 The structure is the core component of Robindoc. Here you can describe all possible documentation pages and configure the main information for them. Robindoc fully supports both automatic structure generation and custom methods for assembling it. For more details, read the [Items](./02-items.md) page.
 
-```ts
+```ts filename="/docs/robindoc.ts"
 import { initializeRobindoc } from "robindoc";
 
 export const { Page, Sidebar } = initializeRobindoc({
diff --git a/docs/03-customization/01-elements/README.md b/docs/03-customization/01-elements/README.md
index 5b41e80a..b1fde02e 100644
--- a/docs/03-customization/01-elements/README.md
+++ b/docs/03-customization/01-elements/README.md
@@ -14,14 +14,14 @@ The documentation layout consists of several elements: `Layout`, `Main`, `Keylin
 
 - [`KeylinkToContent` and `KeylinkToNavigation`](./keylinks.md) are special components designed to improve accessibility.
 
-- [`Sidebar`](./sidebar.md) is responsible for side navigation. It displays all available documentation pages with nesting levels. This component is rendered on each page and depends on the generated structure.
+- [`Sidebar`](./sidebar.md) is responsible for side navigation. It displays all available documentation pages with nesting levels. This component is rendered on each page and depends on the generated structure. Sidebar is independent component and you can use it once across the entire section.
 
 - [`Page`](./page.md) is responsible for the content of the document itself. It handles displaying markdown-based files as HTML. This component is rendered on each page and depends on the generated structure.
 
 ## Blocks usage
 
-`Header`, `Footer`, `RobinProvider`, `Main`, `KeylinkToContent`, and `KeylinkToNavigation` are global elements. It is recommended to include them on all documentation pages.
+`Header`, `Footer`, `RobinProvider`, `Main`, `KeylinkToContent`, `KeylinkToNavigation` and `Sidebar` are global elements. It is recommended to include them under all documentation pages.
 
-`Page` and `Sidebar` are dynamic elements and should be added to each page.
+`Page` is dynamic elements and should be added to each page.
 
-The specific usage of the elements depends on the chosen framework. For more details on using these elements, refer to the section [App organization](../../01-getting-started/04-app-organization/README.md).
+For more details on using these elements, refer to the section [App organization](../../01-getting-started/04-app-organization.md).
diff --git a/docs/03-customization/01-elements/footer.md b/docs/03-customization/01-elements/footer.md
index ab58c920..6f3f7a17 100644
--- a/docs/03-customization/01-elements/footer.md
+++ b/docs/03-customization/01-elements/footer.md
@@ -29,4 +29,4 @@ All customization in Robindoc happens through the structure and props of the com
 
 `Footer` is an independent component and doesn't rely on any specific page. It's assumed you can use it once across the entire project or section.
 
-The specific usage of the component depends on the chosen framework. For more details on using `Footer`, refer to the section [App organization](../../01-getting-started/04-app-organization/README.md).
+For more details on using `Footer`, refer to the section [App organization](../../01-getting-started/04-app-organization.md).
diff --git a/docs/03-customization/01-elements/header.md b/docs/03-customization/01-elements/header.md
index 9b8b7d02..1f10356d 100644
--- a/docs/03-customization/01-elements/header.md
+++ b/docs/03-customization/01-elements/header.md
@@ -25,8 +25,6 @@ All customization in Robindoc happens through the structure and props of the com
 
 `links` [`{ title: string; href: string }[]`] - a list of links to pages on your site unrelated to the documentation section. This could include blog, showcases, about, etc.;
 
-`link` [`React.ElementType`] - the link component of the framework or router being used. If this component is not provided, the default `<a>` tag will be used everywhere;
-
 `searcher` - the route for search functionality or a client-side async callback. If this field is not provided, search functionality will not be available. Read more on the "[Search](../03-search.md)" page;
 
 `translations` [`{ [key: string]: string }`] - translations for the current block. The key is the term identifier, and the value is the corresponding translation. _For the latest list of terms, check the editor hints_;
@@ -39,4 +37,4 @@ All customization in Robindoc happens through the structure and props of the com
 
 `Header` is an independent component and doesn't rely on any specific page. It's assumed you can use it once across the entire project or section.
 
-The specific usage of the component depends on the chosen framework. For more details on using `Header`, refer to the section [App organization](../../01-getting-started/04-app-organization/README.md).
+For more details on using `Header`, refer to the section [App organization](../../01-getting-started/04-app-organization.md).
diff --git a/docs/03-customization/01-elements/keylinks.md b/docs/03-customization/01-elements/keylinks.md
index 8b4bd82c..bf3861b1 100644
--- a/docs/03-customization/01-elements/keylinks.md
+++ b/docs/03-customization/01-elements/keylinks.md
@@ -42,19 +42,23 @@ This element should be inserted at the very end of the page, i.e., the last elem
 `KeylinkToNavigation` should be added at the page level in case there are pages without navigation.
 </Note>
 
-```tsx
-import { Page, Sidebar } from "./robindoc";
-import { KeylinkToNavigation } from "robindoc";
+```tsx filename="/docs/layout.tsx"
+import type { Metadata } from "next";
+import { Main, KeylinkToNavigation } from "robindoc";
+
+import { Sidebar } from "./robindoc";
 
-export default async function Docs() {
+const DocsLayout = ({ children }: Readonly<{ children?: JSX.Element }>) => {
   return (
-    <>
-      <Sidebar pathname="/docs/introduction" />
-      <Page pathname="/docs/introduction" />
+    <Main>
+      <Sidebar />
+      {children}
       <KeylinkToNavigation />
-    </>
+    </Main>
   );
-}
+};
+
+export default DocsLayout;
 ```
 
 <Note>
diff --git a/docs/03-customization/01-elements/main.md b/docs/03-customization/01-elements/main.md
index 56112818..6c74ef56 100644
--- a/docs/03-customization/01-elements/main.md
+++ b/docs/03-customization/01-elements/main.md
@@ -14,4 +14,4 @@ export const Main = ({ children }) => {
 
 `Main` is an independent component and doesn't rely on any specific page. It's assumed you can use it once across the entire project or section.
 
-The specific usage of the component depends on the chosen framework. For more details on using `Main`, refer to the section [App organization](../../01-getting-started/04-app-organization/README.md).
+For more details on using `Main`, refer to the section [App organization](../../01-getting-started/04-app-organization.md).
diff --git a/docs/03-customization/01-elements/page.md b/docs/03-customization/01-elements/page.md
index 7ea9f151..61491522 100644
--- a/docs/03-customization/01-elements/page.md
+++ b/docs/03-customization/01-elements/page.md
@@ -2,20 +2,17 @@
 
 `Page` is a block responsible for the content of the document itself. It handles displaying markdown-based files as HTML.
 
-```tsx
-import { Page, Sidebar } from "./robindoc";
+```tsx filename ="/docs/example/page.tsx"
+import { Page } from "./robindoc";
 
 export const Page = ({ children }) => {
   return (
-    <>
-      <Sidebar /* ... */ />
-      <Page
-        pathname="/docs/example"
-        components={{
-          Example: ({ children }) => <span>{children}</span>,
-        }}
-      />
-    </>
+    <Page
+      pathname="/docs/example"
+      components={{
+        Example: ({ children }) => <span>{children}</span>,
+      }}
+    />
   );
 };
 ```
@@ -26,8 +23,6 @@ All customization in Robindoc happens through the structure and props of the com
 
 ### Base Props
 
-`link` [`React.ElementType`] - the link component of the framework or router being used. If this component is not provided, the default `<a>` tag will be used everywhere;
-
 `pathname` [`string`] - the path of the current page. It should be specified completely, including the `basePath`;
 
 `config` - the configuration for the Robindoc parser;
@@ -54,4 +49,4 @@ All customization in Robindoc happens through the structure and props of the com
 
 `Page` is rendered on every page and depends on the generated structure.
 
-The specific usage of the component depends on the chosen framework. For more details on using `Page`, refer to the section [App organization](../../01-getting-started/04-app-organization/README.md).
+For more details on using `Page`, refer to the section [App organization](../../01-getting-started/04-app-organization.md).
diff --git a/docs/03-customization/01-elements/robin-provider.md b/docs/03-customization/01-elements/robin-provider.md
index 7d2e1427..a467c2bb 100644
--- a/docs/03-customization/01-elements/robin-provider.md
+++ b/docs/03-customization/01-elements/robin-provider.md
@@ -12,4 +12,4 @@ export const Layout = ({ children }) => {
 
 ## Usage
 
-The specific usage of the element depends on the chosen framework. For more details on using `RobinProvider`, refer to the section [App organization](../../01-getting-started/04-app-organization/README.md).
+For more details on using `RobinProvider`, refer to the section [App organization](../../01-getting-started/04-app-organization.md).
diff --git a/docs/03-customization/01-elements/sidebar.md b/docs/03-customization/01-elements/sidebar.md
index 0f900b8c..81f08515 100644
--- a/docs/03-customization/01-elements/sidebar.md
+++ b/docs/03-customization/01-elements/sidebar.md
@@ -2,15 +2,15 @@
 
 `Sidebar` is a block responsible for side navigation. It displays all available documentation pages with nesting levels.
 
-```tsx
-import { Page, Sidebar } from "./robindoc";
+```tsx filename="/docs/layout.tsx"
+import { Sidebar } from "./robindoc";
 
-export const Page = ({ children }) => {
+const DocsLayout = ({ children }: Readonly<{ children?: JSX.Element }>) => {
   return (
-    <>
-      <Sidebar pathname="/docs/example" />
-      <Page /* ... */ />
-    </>
+    <Main>
+      <Sidebar />
+      {children}
+    </Main>
   );
 };
 ```
@@ -19,14 +19,10 @@ export const Page = ({ children }) => {
 
 All customization in Robindoc happens through the structure and props of the components.
 
-`link` [`React.ElementType`] - the link component of the framework or router being used. If this component is not provided, the default `<a>` tag will be used.
-
-`pathname` [`string`] - the path of the current page. It should be specified completely, including the `basePath`.
-
 `translations` [`{ [key: string]: string }`] - translations for the current block. The key is the term identifier, and the value is the corresponding translation. _For the latest list of terms, check the editor hints_.
 
 ## Usage
 
-`Sidebar` is rendered on every page and depends on the generated structure.
+`Sidebar` is independent component and you can use it once across the entire section.
 
-The specific usage of the element depends on the chosen framework. For more details on using `Sidebar`, refer to the section [App organization](../../01-getting-started/04-app-organization/README.md).
+For more details on `Sidebar` usage, refer to the section [App organization](../../01-getting-started/04-app-organization.md).
diff --git a/docs/03-customization/02-tools/README.md b/docs/03-customization/02-tools/README.md
index d3e4e988..f9fe8a53 100644
--- a/docs/03-customization/02-tools/README.md
+++ b/docs/03-customization/02-tools/README.md
@@ -2,9 +2,9 @@
 
 When initializing Robindoc, in addition to the core elements, you will also receive special utilities.
 
-These utilities work based on the structure and documentation files. They are needed to fine-tune page generation, and their specific usage will vary depending on the chosen framework. For more details on page configuration, refer to the [App Organization](../../01-getting-started/04-app-organization/README.md) page.
+These utilities work based on the structure and documentation files. They are needed to fine-tune page generation. For more details on page configuration, refer to the [App Organization](../../01-getting-started/04-app-organization.md) page.
 
-```ts
+```ts filename="/docs/robindoc.ts"
 import { initializeRobindoc } from "robindoc";
 
 export const { Page, Sidebar, getPages, getMeta, getPageContent } =
diff --git a/docs/03-customization/02-tools/get-meta.md b/docs/03-customization/02-tools/get-meta.md
index 8b704891..a8355250 100644
--- a/docs/03-customization/02-tools/get-meta.md
+++ b/docs/03-customization/02-tools/get-meta.md
@@ -19,11 +19,11 @@ If you do not provide a front-matter title, the first-level heading of the page
 
 `getMeta` is obtained as a result of [initializing Robindoc](../../01-getting-started/03-initialization.md).
 
-The specific usage depends on the chosen framework and needs. For more details on using the utility in your application, refer to the section [App Organization](../../01-getting-started/04-app-organization/README.md).
+For more details on using the utility in your application, refer to the section [App Organization](../../01-getting-started/04-app-organization.md).
 
 You can get the metadata object for a specific page using the following method:
 
-```ts
+```ts filename="/docs/page.tsx"
 import { getMeta } from "./robindoc";
 
 export const getPageMetadata = async (pathname: string) => {
diff --git a/docs/03-customization/02-tools/get-page-content.md b/docs/03-customization/02-tools/get-page-content.md
index c2dc2dcd..789945d7 100644
--- a/docs/03-customization/02-tools/get-page-content.md
+++ b/docs/03-customization/02-tools/get-page-content.md
@@ -6,7 +6,7 @@
 
 `getPageContent` is obtained as a result of [initializing Robindoc](../../01-getting-started/03-initialization.md).
 
-It can be used, for example, for search functionality. For more details on general search configuration, refer to the [Search](../03-search.md) page. For framework-specific setup, refer to the [App Organization](../../01-getting-started/04-app-organization/README.md) page.
+It can be used, for example, for search functionality. For more details on general search configuration, refer to the [Search](../03-search.md) page. For Next.js-specific setup, refer to the [App Organization](../../01-getting-started/04-app-organization.md) page.
 
 ```ts
 const searchResults = [];
diff --git a/docs/03-customization/02-tools/get-pages.md b/docs/03-customization/02-tools/get-pages.md
index e18cad40..b7813b65 100644
--- a/docs/03-customization/02-tools/get-pages.md
+++ b/docs/03-customization/02-tools/get-pages.md
@@ -6,7 +6,7 @@
 
 `getPages` is obtained as a result of [initializing Robindoc](../../01-getting-started/03-initialization.md).
 
-The specific usage depends on the chosen framework and needs. For more details on using the utility in your application, refer to the [App Organization](../../01-getting-started/04-app-organization/README.md) page.
+For more details on using the utility in your application, refer to the [App Organization](../../01-getting-started/04-app-organization.md) page.
 
 You can obtain an array of objects with the list of segments for each page using the following method:
 
diff --git a/docs/03-customization/03-search.md b/docs/03-customization/03-search.md
index c7343dc1..2a42e089 100644
--- a/docs/03-customization/03-search.md
+++ b/docs/03-customization/03-search.md
@@ -77,4 +77,4 @@ export const GET = async (request: Request) => {
 };
 ```
 
-For more information about configuring search, refer to the page on [App Organization](../01-getting-started/04-app-organization/README.md).
+For more information about configuring search, refer to the page on [App Organization](../01-getting-started/04-app-organization.md).
diff --git a/docs/03-customization/README.md b/docs/03-customization/README.md
index bf2328d4..4b4aed95 100644
--- a/docs/03-customization/README.md
+++ b/docs/03-customization/README.md
@@ -4,7 +4,7 @@ Page layout consists of [special blocks](./01-elements/README.md). For additiona
 
 All styles are collected separately and are included once for the entire application from `robindoc/lib/styles.css`:
 
-```tsx
+```tsx filename="/docs/page.tsx"
 import { RobinProvider, Header, Footer, Main } from "robindoc";
 import { Page, Sidebar } from "./robindoc";
 import "robindoc/lib/styles.css";
@@ -23,9 +23,9 @@ export const Documentation = () => {
 };
 ```
 
-Framework-based logic configuration - link component, search API route, and the current page path - is up to you. For more details, read the [App Organization](../01-getting-started/04-app-organization/README.md) page.
+Framework-based logic configuration - search API route, and the current page path - is up to you. For more details, read the [App Organization](../01-getting-started/04-app-organization.md) page.
 
-Robindoc works entirely on React.js (and only on it). The choice of framework (next.js/remix/react router, etc.) is entirely up to you. At the same time, Robindoc does not require any modifications to the bundler. The framework is fully built on the capabilities of RSC, allowing you to build documentation as a static site or generate pages dynamically.
+Robindoc works entirely does not require any modifications to the bundler. The framework is fully built on the capabilities of RSC, allowing you to build documentation as a static site or generate pages dynamically.
 
 As a result, Robindoc does not affect other pages of the service. Essentially, these are just regular components that build large blocks based on markdown files and instructions. Conversely, you can easily integrate Robindoc into any site that supports RSC.
 
diff --git a/site/src/app/docs/[[...path]]/page.tsx b/site/src/app/docs/[[...path]]/page.tsx
index 91d39c19..7a61fbfb 100644
--- a/site/src/app/docs/[[...path]]/page.tsx
+++ b/site/src/app/docs/[[...path]]/page.tsx
@@ -1,5 +1,3 @@
-import { KeylinkToNavigation } from "robindoc";
-
 import { Page, getMeta, getPageData, getPages } from "../robindoc";
 import { Note } from "../../../components/ui/note";
 import { PackageLinks } from "../../../components/ui/package-links";
@@ -9,20 +7,17 @@ const Docs = async ({ params }: { params: { path?: string[] } }) => {
     const pageData = await getPageData(path);
 
     return (
-        <>
-            <Page
-                pathname={path}
-                components={{
-                    Note,
-                    PackageLinks,
-                }}
-                config={{
-                    publicDirs: ['public']
-                }}
-                editUri={`https://github.com/vordgi/robindoc/edit/main/site/${pageData.origPath}`}
-            />
-            <KeylinkToNavigation />
-        </>
+        <Page
+            pathname={path}
+            components={{
+                Note,
+                PackageLinks,
+            }}
+            config={{
+                publicDirs: ['public']
+            }}
+            editUri={`https://github.com/vordgi/robindoc/edit/main/site/${pageData.origPath}`}
+        />
     );
 }
 
diff --git a/site/src/app/docs/layout.tsx b/site/src/app/docs/layout.tsx
index c0fd90ff..c274d17b 100644
--- a/site/src/app/docs/layout.tsx
+++ b/site/src/app/docs/layout.tsx
@@ -1,5 +1,5 @@
 import type { Metadata } from "next";
-import { Main } from 'robindoc';
+import { Main, KeylinkToNavigation } from 'robindoc';
 
 import { Sidebar } from "./robindoc";
 
@@ -16,6 +16,7 @@ const DocsLayout = ({ children }: Readonly<{ children?: JSX.Element }>) => {
         <Main>
             <Sidebar />
             {children}
+            <KeylinkToNavigation />
         </Main>
     );
 }
diff --git a/site/src/components/sections/features/index.tsx b/site/src/components/sections/features/index.tsx
index 2d7b3f8f..2b696f26 100644
--- a/site/src/components/sections/features/index.tsx
+++ b/site/src/components/sections/features/index.tsx
@@ -34,7 +34,7 @@ export const Features: React.FC = () => {
                     <Paragraph>
                         Robindoc is built on RSC. This gives flexibility and dynamics. But the most important thing is freedom of choice!
                         <br />
-                        Use any framework, any bundler and any configuration!
+                        Use any bundler and any configuration in any project!
                     </Paragraph>
                 </div>
                 <ToolsImg className='features-img' />

From a75e4025ec5b627cf7f27fdc1082c531562997be Mon Sep 17 00:00:00 2001
From: Vordgi <sasha2822222@gmail.com>
Date: Tue, 15 Oct 2024 22:44:35 +0400
Subject: [PATCH 4/4] rd-314 release 2.0.0

---
 packages/robindoc/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/robindoc/package.json b/packages/robindoc/package.json
index 5b5bf09d..72612c61 100644
--- a/packages/robindoc/package.json
+++ b/packages/robindoc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "robindoc",
-  "version": "1.2.5",
+  "version": "2.0.0",
   "description": "",
   "main": "./lib/index.js",
   "scripts": {