Merge pull request #2650 from ably/web-4440-docs-lang-filtering

[WEB-4440] fix: restrict dl child filtering to active language from context

Author: jamiehenson

src/components/blocks/list/Dl/DlWrapper.tsx

@@ -1,18 +1,22 @@
 import { Children, FunctionComponent } from 'react';
-import { useLayoutContext, DEFAULT_LANGUAGE } from 'src/contexts/layout-context';
+import { useLayoutContext } from 'src/contexts/layout-context';
 
-export const DlWrapper: FunctionComponent<unknown> = ({ children }) => {
+type DlWrapperProps = {
+  children: React.ReactElement<{
+    attribs?: {
+      lang?: string;
+    };
+  }>[];
+};
+
+export const DlWrapper: FunctionComponent<DlWrapperProps> = ({ children }) => {
   const { activePage } = useLayoutContext();
 
   return Children.map(children, (child) => {
     const attribs = child?.props?.attribs;
 
     if (attribs?.lang) {
-      if (
-        (activePage.language === DEFAULT_LANGUAGE && attribs?.lang === DEFAULT_LANGUAGE) ||
-        attribs?.lang === activePage.language ||
-        attribs?.lang === DEFAULT_LANGUAGE
-      ) {
+      if (attribs.lang === activePage.language) {
         return child;
       }
       return null;

src/components/blocks/software/Pre.tsx

@@ -4,7 +4,6 @@ import Icon from '@ably/ui/core/Icon';
 import Html from '../Html';
 import LocalLanguageAlternatives from '../wrappers/LocalLanguageAlternatives';
 import {
-  DEFAULT_LANGUAGE,
   DEFAULT_PREFERRED_INTERFACE,
   DEFAULT_PREFERRED_LANGUAGE,
   REALTIME_SDK_INTERFACE,
@@ -67,8 +66,7 @@ const Pre = ({
 
   const codeClassName = 'bg-cool-black text-white p-0 rounded-lg relative max-w-[calc(100vw-48px)] sm:max-w-full';
 
-  const hasCode =
-    languages?.some((lang) => getTrimmedLanguage(lang) === pageLanguage) || pageLanguage === DEFAULT_LANGUAGE;
+  const hasCode = languages?.some((lang) => getTrimmedLanguage(lang) === pageLanguage);
   const shouldDisplayTip = !hasCode && languages?.length !== undefined;
   const withModifiedClassname = {
     ...attribs,