|
8 | 8 | } from '@guardian/source/foundations'; |
9 | 9 | import { Hide } from '@guardian/source/react-components'; |
10 | 10 | import { StraightLines } from '@guardian/source-development-kitchen/react-components'; |
11 | | -import { Accordion } from '../components/Accordion'; |
12 | 11 | import { RightAdsPlaceholder } from '../components/AdPlaceholder.apps'; |
13 | 12 | import { AdPortals } from '../components/AdPortals.importable'; |
14 | 13 | import { AdSlot, MobileStickyContainer } from '../components/AdSlot.web'; |
@@ -767,135 +766,118 @@ export const LiveLayout = (props: WebProps | AppsProps) => { |
767 | 766 | ) : ( |
768 | 767 | <></> |
769 | 768 | )} |
770 | | - <Accordion accordionTitle="Live feed"> |
771 | | - <ArticleContainer format={format}> |
772 | | - {pagination.currentPage !== 1 && ( |
773 | | - <Pagination |
774 | | - currentPage={ |
775 | | - pagination.currentPage |
776 | | - } |
777 | | - totalPages={ |
778 | | - pagination.totalPages |
779 | | - } |
780 | | - newest={pagination.newest} |
781 | | - oldest={pagination.oldest} |
782 | | - newer={pagination.newer} |
783 | | - older={pagination.older} |
784 | | - renderingTarget={ |
785 | | - renderingTarget |
786 | | - } |
787 | | - /> |
788 | | - )} |
789 | | - <ArticleBody |
790 | | - format={format} |
791 | | - blocks={article.blocks} |
792 | | - pinnedPost={article.pinnedPost} |
793 | | - host={host} |
794 | | - pageId={article.pageId} |
795 | | - webTitle={article.webTitle} |
796 | | - ajaxUrl={article.config.ajaxUrl} |
797 | | - sectionId={ |
798 | | - article.config.section |
799 | | - } |
800 | | - abTests={article.config.abTests} |
801 | | - switches={ |
802 | | - article.config.switches |
| 769 | + <ArticleContainer format={format}> |
| 770 | + {pagination.currentPage !== 1 && ( |
| 771 | + <Pagination |
| 772 | + currentPage={ |
| 773 | + pagination.currentPage |
803 | 774 | } |
804 | | - isSensitive={ |
805 | | - article.config.isSensitive |
| 775 | + totalPages={ |
| 776 | + pagination.totalPages |
806 | 777 | } |
807 | | - isAdFreeUser={ |
808 | | - article.isAdFreeUser |
809 | | - } |
810 | | - shouldHideReaderRevenue={ |
811 | | - article.shouldHideReaderRevenue |
812 | | - } |
813 | | - tags={article.tags} |
814 | | - isPaidContent={ |
815 | | - !!article.config |
816 | | - .isPaidContent |
817 | | - } |
818 | | - contributionsServiceUrl={ |
819 | | - contributionsServiceUrl |
820 | | - } |
821 | | - contentType={ |
822 | | - article.contentType |
823 | | - } |
824 | | - isPreview={ |
825 | | - article.config.isPreview |
826 | | - } |
827 | | - idUrl={ |
828 | | - article.config.idUrl ?? '' |
829 | | - } |
830 | | - isDev={!!article.config.isDev} |
831 | | - onFirstPage={ |
832 | | - pagination.currentPage === 1 |
833 | | - } |
834 | | - keyEvents={article.keyEvents} |
835 | | - filterKeyEvents={ |
836 | | - article.filterKeyEvents |
837 | | - } |
838 | | - keywordIds={ |
839 | | - article.config.keywordIds |
840 | | - } |
841 | | - lang={article.lang} |
842 | | - isRightToLeftLang={ |
843 | | - article.isRightToLeftLang |
844 | | - } |
845 | | - editionId={article.editionId} |
846 | | - shouldHideAds={ |
847 | | - article.shouldHideAds |
848 | | - } |
849 | | - serverTime={serverTime} |
850 | | - idApiUrl={ |
851 | | - article.config.idApiUrl |
| 778 | + newest={pagination.newest} |
| 779 | + oldest={pagination.oldest} |
| 780 | + newer={pagination.newer} |
| 781 | + older={pagination.older} |
| 782 | + renderingTarget={ |
| 783 | + renderingTarget |
852 | 784 | } |
853 | 785 | /> |
854 | | - {pagination.totalPages > 1 && ( |
855 | | - <Pagination |
856 | | - currentPage={ |
857 | | - pagination.currentPage |
858 | | - } |
859 | | - totalPages={ |
860 | | - pagination.totalPages |
861 | | - } |
862 | | - newest={pagination.newest} |
863 | | - oldest={pagination.oldest} |
864 | | - newer={pagination.newer} |
865 | | - older={pagination.older} |
866 | | - renderingTarget={ |
867 | | - renderingTarget |
868 | | - } |
869 | | - /> |
870 | | - )} |
871 | | - <StraightLines |
872 | | - data-print-layout="hide" |
873 | | - count={4} |
874 | | - color={themePalette( |
875 | | - '--straight-lines', |
876 | | - )} |
877 | | - cssOverrides={css` |
878 | | - display: block; |
879 | | - `} |
880 | | - /> |
881 | | - <SubMeta |
882 | | - format={format} |
883 | | - subMetaKeywordLinks={ |
884 | | - article.subMetaKeywordLinks |
| 786 | + )} |
| 787 | + <ArticleBody |
| 788 | + format={format} |
| 789 | + blocks={article.blocks} |
| 790 | + pinnedPost={article.pinnedPost} |
| 791 | + host={host} |
| 792 | + pageId={article.pageId} |
| 793 | + webTitle={article.webTitle} |
| 794 | + ajaxUrl={article.config.ajaxUrl} |
| 795 | + sectionId={article.config.section} |
| 796 | + abTests={article.config.abTests} |
| 797 | + switches={article.config.switches} |
| 798 | + isSensitive={ |
| 799 | + article.config.isSensitive |
| 800 | + } |
| 801 | + isAdFreeUser={article.isAdFreeUser} |
| 802 | + shouldHideReaderRevenue={ |
| 803 | + article.shouldHideReaderRevenue |
| 804 | + } |
| 805 | + tags={article.tags} |
| 806 | + isPaidContent={ |
| 807 | + !!article.config.isPaidContent |
| 808 | + } |
| 809 | + contributionsServiceUrl={ |
| 810 | + contributionsServiceUrl |
| 811 | + } |
| 812 | + contentType={article.contentType} |
| 813 | + isPreview={article.config.isPreview} |
| 814 | + idUrl={article.config.idUrl ?? ''} |
| 815 | + isDev={!!article.config.isDev} |
| 816 | + onFirstPage={ |
| 817 | + pagination.currentPage === 1 |
| 818 | + } |
| 819 | + keyEvents={article.keyEvents} |
| 820 | + filterKeyEvents={ |
| 821 | + article.filterKeyEvents |
| 822 | + } |
| 823 | + keywordIds={ |
| 824 | + article.config.keywordIds |
| 825 | + } |
| 826 | + lang={article.lang} |
| 827 | + isRightToLeftLang={ |
| 828 | + article.isRightToLeftLang |
| 829 | + } |
| 830 | + editionId={article.editionId} |
| 831 | + shouldHideAds={ |
| 832 | + article.shouldHideAds |
| 833 | + } |
| 834 | + serverTime={serverTime} |
| 835 | + idApiUrl={article.config.idApiUrl} |
| 836 | + /> |
| 837 | + {pagination.totalPages > 1 && ( |
| 838 | + <Pagination |
| 839 | + currentPage={ |
| 840 | + pagination.currentPage |
885 | 841 | } |
886 | | - subMetaSectionLinks={ |
887 | | - article.subMetaSectionLinks |
| 842 | + totalPages={ |
| 843 | + pagination.totalPages |
888 | 844 | } |
889 | | - pageId={article.pageId} |
890 | | - webUrl={article.webURL} |
891 | | - webTitle={article.webTitle} |
892 | | - showBottomSocialButtons={ |
893 | | - article.showBottomSocialButtons && |
894 | | - renderingTarget === 'Web' |
| 845 | + newest={pagination.newest} |
| 846 | + oldest={pagination.oldest} |
| 847 | + newer={pagination.newer} |
| 848 | + older={pagination.older} |
| 849 | + renderingTarget={ |
| 850 | + renderingTarget |
895 | 851 | } |
896 | 852 | /> |
897 | | - </ArticleContainer> |
898 | | - </Accordion> |
| 853 | + )} |
| 854 | + <StraightLines |
| 855 | + data-print-layout="hide" |
| 856 | + count={4} |
| 857 | + color={themePalette( |
| 858 | + '--straight-lines', |
| 859 | + )} |
| 860 | + cssOverrides={css` |
| 861 | + display: block; |
| 862 | + `} |
| 863 | + /> |
| 864 | + <SubMeta |
| 865 | + format={format} |
| 866 | + subMetaKeywordLinks={ |
| 867 | + article.subMetaKeywordLinks |
| 868 | + } |
| 869 | + subMetaSectionLinks={ |
| 870 | + article.subMetaSectionLinks |
| 871 | + } |
| 872 | + pageId={article.pageId} |
| 873 | + webUrl={article.webURL} |
| 874 | + webTitle={article.webTitle} |
| 875 | + showBottomSocialButtons={ |
| 876 | + article.showBottomSocialButtons && |
| 877 | + renderingTarget === 'Web' |
| 878 | + } |
| 879 | + /> |
| 880 | + </ArticleContainer> |
899 | 881 | </div> |
900 | 882 | </GridItem> |
901 | 883 | <GridItem area="right-column"> |
|
0 commit comments