Votos estimados
diff --git a/src/components/campaign/shared/CampaignCellTooltip.tsx b/src/components/campaign/shared/CampaignCellTooltip.tsx
index 3efd3523..b8421d99 100644
--- a/src/components/campaign/shared/CampaignCellTooltip.tsx
+++ b/src/components/campaign/shared/CampaignCellTooltip.tsx
@@ -9,9 +9,9 @@ import { CampaignHoverTooltip } from '@/components/campaign/shared/CampaignHover
* `CampaignTableColumn.cellTooltip`. Columns declare the extra reading; the
* table wraps the cell in this.
*
- * The trigger `
` is created HERE, inside the client boundary, because
- * `CampaignHoverTooltip` clones its child to attach a ref: an element built by
- * the server component that owns the table would not survive that.
+ * The trigger `` is created HERE rather than by the column, so a column
+ * declares only the data (`cellTooltip`) and the table owns the affordance —
+ * every cell tooltip in the system then behaves and is sized identically.
*
* It deliberately takes no `tabIndex` — 435 rows × N columns of dead tab stops
* would be a worse trade than the redundancy contract documented on
diff --git a/src/components/campaign/shared/CampaignHoverTooltip.tsx b/src/components/campaign/shared/CampaignHoverTooltip.tsx
index d6d665d1..1d99cdda 100644
--- a/src/components/campaign/shared/CampaignHoverTooltip.tsx
+++ b/src/components/campaign/shared/CampaignHoverTooltip.tsx
@@ -10,10 +10,9 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/comp
* heading or table cell. Shared by the campaign list system: column headers
* (`MunicipalitySortableHead`), card metrics, and cell content via
* `CampaignTable`'s `cellTooltip`. Radix's `TooltipTrigger` deliberately
- * ignores touch pointer
- * events — no hover on touch, and a tap doesn't reliably focus a non-form
- * element either — which otherwise makes the whole tooltip unreachable on
- * phones (an `/impeccable critique` finding). The open state is controlled
+ * ignores touch pointer events — no hover on touch, and a tap doesn't
+ * reliably focus a non-form element either — which otherwise makes the whole
+ * tooltip unreachable on phones (an `/impeccable critique` finding). The open state is controlled
* so a `pointerType === 'touch'` tap can explicitly toggle it; mouse hover
* and keyboard focus are untouched (Radix keeps driving `onOpenChange` for
* those exactly as before), so a **mouse** click — which already hovered the
diff --git a/src/lib/bahiaElectionAggregates.ts b/src/lib/bahiaElectionAggregates.ts
index 0af9fba7..1c1c4b8b 100644
--- a/src/lib/bahiaElectionAggregates.ts
+++ b/src/lib/bahiaElectionAggregates.ts
@@ -80,13 +80,11 @@ export const getMunicipalityFederalBaseline = (slug: string): MunicipalityFedera
artifact.municipalities[slug] ?? EMPTY_BASELINE
/** Statewide sums of the artifact for one year — the denominators of every relative reading. */
-export type StatewideFederalTotals = {
+type StatewideFederalTotals = {
/** Candidate's own nominal votes across every catalog municipality. */
ownVotes: number
/** Federal T1 valid votes across every catalog municipality. */
validVotes: number
- /** Curated campo-parties federal nominal votes across every catalog municipality. */
- campoVotes: number
}
const statewideTotalsCache = new Map()
@@ -101,11 +99,10 @@ export const getStatewideFederalTotals = (year: number): StatewideFederalTotals
if (cached) return cached
const yearKey = String(year)
- const totals: StatewideFederalTotals = { ownVotes: 0, validVotes: 0, campoVotes: 0 }
+ const totals: StatewideFederalTotals = { ownVotes: 0, validVotes: 0 }
for (const baseline of Object.values(artifact.municipalities)) {
totals.ownVotes += baseline.votesByYear[yearKey] ?? 0
totals.validVotes += baseline.validVotesByYear[yearKey] ?? 0
- totals.campoVotes += baseline.campoFederalVotesByYear[yearKey] ?? 0
}
statewideTotalsCache.set(year, totals)
diff --git a/src/lib/electionFormat.ts b/src/lib/electionFormat.ts
index 7b75fd34..da3debfd 100644
--- a/src/lib/electionFormat.ts
+++ b/src/lib/electionFormat.ts
@@ -6,6 +6,12 @@
*/
const numberFormatter = new Intl.NumberFormat('pt-BR', { maximumFractionDigits: 0 })
+/** Shares and multiples: one decimal at most, never a forced trailing zero. */
+export const oneDecimalFormatter = new Intl.NumberFormat('pt-BR', {
+ maximumFractionDigits: 1,
+ minimumFractionDigits: 0,
+})
+
export const formatElectionNumber = (value: number): string => numberFormatter.format(value)
/**
@@ -15,7 +21,4 @@ export const formatElectionNumber = (value: number): string => numberFormatter.f
* committed TSE artifact along with it.
*/
export const formatVoteSharePercent = (share: number): string =>
- `${(share * 100).toLocaleString('pt-BR', {
- maximumFractionDigits: 1,
- minimumFractionDigits: 0,
- })}%`
+ `${oneDecimalFormatter.format(share * 100)}%`
diff --git a/src/utilities/campaignListUrl.ts b/src/utilities/campaignListUrl.ts
index e1a20c78..d809988d 100644
--- a/src/utilities/campaignListUrl.ts
+++ b/src/utilities/campaignListUrl.ts
@@ -15,6 +15,21 @@ export const allParamValues = (value: string | string[] | undefined): string[] =
return [...seen]
}
+/**
+ * A repeatable enum param where selecting EVERY member means "todas" — which
+ * is the same filter as selecting none, and canonicalizes to the absent param
+ * so both produce one URL (B18's frozen contract). `allParamValues` already
+ * dropped duplicates and unknown tokens are ignored, so a hand-typed URL can
+ * never widen the filter.
+ */
+export const parseExhaustiveEnumParam = (
+ raw: string | string[] | undefined,
+ allowed: ReadonlySet,
+): T[] => {
+ const values = allParamValues(raw).filter((token): token is T => allowed.has(token))
+ return values.length < allowed.size ? values : []
+}
+
export const normalizedText = (value: string | undefined): string | undefined => {
if (typeof value !== 'string') return undefined
const normalized = value.trim()
diff --git a/src/utilities/municipalityLabels.ts b/src/utilities/municipalityLabels.ts
index e0357da5..1230c7a6 100644
--- a/src/utilities/municipalityLabels.ts
+++ b/src/utilities/municipalityLabels.ts
@@ -1,9 +1,15 @@
/**
* Municipality display labels shared by list, detail, dossier and map
- * surfaces. Client-safe: types + string tables only (split out of the former
- * `municipalityUi.ts` in Pass 2 W1).
+ * surfaces. Client-safe: string tables plus the pure formatters that turn a
+ * derived value into its pt-BR copy — no Payload, no DB, and no value import
+ * from a `server-only` module (split out of the former `municipalityUi.ts` in
+ * Pass 2 W1).
*/
-import { formatElectionNumber, formatVoteSharePercent } from '@/lib/electionFormat'
+import {
+ formatElectionNumber,
+ formatVoteSharePercent,
+ oneDecimalFormatter,
+} from '@/lib/electionFormat'
import { municipalityCatalog } from '@/lib/municipalityCatalog'
import type { CampaignUser, Municipality } from '@/payload-types'
import { formatRatioAsPercentLabel } from '@/utilities/goalCoverage'
@@ -58,9 +64,13 @@ export const territorialClassLabels: Record {
return 'no padrão estadual do candidato'
}
return factor.value >= 1
- ? `${factor.value.toLocaleString('pt-BR', { maximumFractionDigits: 1 })}× o padrão estadual do candidato`
- : `${Math.round((1 - factor.value) * 100)}% abaixo do padrão estadual do candidato`
+ ? `${oneDecimalFormatter.format(factor.value)}× o padrão estadual do candidato`
+ : `${formatRatioAsPercentLabel(1 - factor.value)} abaixo do padrão estadual do candidato`
case 'ownShare':
return `${formatVoteSharePercent(factor.value)} da votação estadual do candidato`
case 'field':
@@ -98,14 +108,18 @@ const formatTerritorialClassFactor = (factor: TerritorialFactor): string => {
}
/** Copy for "no TSE series here" — the class label alone would read as a bug. */
-export const TERRITORIAL_CLASS_NO_DATA = 'Sem série do TSE para este município.'
+const TERRITORIAL_CLASS_NO_DATA = 'Sem série do TSE para este município.'
/**
- * The two dominant factors as one line. Single source for the rule (list cell,
- * detail card and printed dossier all showed the same `slice(0, 2)` before).
+ * The two dominant factors as one line — single source for the rule, which the
+ * list cell, the detail card and the printed dossier each used to carry. Falls
+ * back to the "no series" copy so a caller can never render a blank line where
+ * the "por quê" belongs.
*/
export const formatTerritorialClassWhy = (factors: readonly TerritorialFactor[]): string =>
- factors.slice(0, 2).map(formatTerritorialClassFactor).join(' · ')
+ factors.length === 0
+ ? TERRITORIAL_CLASS_NO_DATA
+ : factors.slice(0, 2).map(formatTerritorialClassFactor).join(' · ')
export const formatMunicipalityConcentrationHint = (
totalUnits: number = municipalityCatalog.length,
diff --git a/src/utilities/municipalityListFilters.ts b/src/utilities/municipalityListFilters.ts
index 57559d22..95957ac9 100644
--- a/src/utilities/municipalityListFilters.ts
+++ b/src/utilities/municipalityListFilters.ts
@@ -277,7 +277,7 @@ export const buildMunicipalityFilterOptionHref = (
const trends = toggled.filter(isPoliticalTrendStatus)
if (trends.length && trends.length < trendStatusCount) next.trends = trends
else delete next.trends
- } else {
+ } else if (param === 'class') {
const classes = toggled.filter(isTerritorialClass)
if (classes.length && classes.length < territorialClassCount) next.classes = classes
else delete next.classes
diff --git a/src/utilities/municipalityListUrl.ts b/src/utilities/municipalityListUrl.ts
index 5de4bbe3..ef8dc73f 100644
--- a/src/utilities/municipalityListUrl.ts
+++ b/src/utilities/municipalityListUrl.ts
@@ -14,6 +14,7 @@ import {
buildListHref,
firstValue,
normalizedText,
+ parseExhaustiveEnumParam,
resolveListUrl,
strictDecimalInteger,
type RawSearchParams as CampaignListRawSearchParams,
@@ -217,33 +218,8 @@ const parseAdvisorsParam = (raw: string | string[] | undefined): number[] => {
}
const politicalTrendStatusSet = new Set(Object.keys(politicalTrendLabels))
-
-/** Selecting every trend means "todas", which is the same thing as selecting none. */
-const parseTrendsParam = (raw: string | string[] | undefined): PoliticalTrendStatus[] => {
- const trends: PoliticalTrendStatus[] = []
- for (const token of allParamValues(raw)) {
- if (!politicalTrendStatusSet.has(token)) continue
- const trend = token as PoliticalTrendStatus
- if (trends.includes(trend)) continue
- trends.push(trend)
- }
- return trends.length < politicalTrendStatusSet.size ? trends : []
-}
-
const territorialClassSet = new Set(Object.keys(territorialClassLabels))
-/** Same "todas = nenhuma" canonicalization as `parseTrendsParam`. */
-const parseClassesParam = (raw: string | string[] | undefined): MunicipalityTerritorialClass[] => {
- const classes: MunicipalityTerritorialClass[] = []
- for (const token of allParamValues(raw)) {
- if (!territorialClassSet.has(token)) continue
- const territorialClass = token as MunicipalityTerritorialClass
- if (classes.includes(territorialClass)) continue
- classes.push(territorialClass)
- }
- return classes.length < territorialClassSet.size ? classes : []
-}
-
export const municipalityListStateToRawParams = (
state: MunicipalityListState,
page = state.page,
@@ -274,8 +250,14 @@ export const parseMunicipalityListParams = (
const rawKind = firstValue(params.kind)
const rawCoverage = firstValue(params.coverage)
const rawPriority = firstValue(params.priority)
- const trends = parseTrendsParam(params.trend)
- const classes = parseClassesParam(params.class)
+ const trends = parseExhaustiveEnumParam(
+ params.trend,
+ politicalTrendStatusSet,
+ )
+ const classes = parseExhaustiveEnumParam(
+ params.class,
+ territorialClassSet,
+ )
const rawCompare = strictDecimalInteger(firstValue(params.compare))
const rawSort = firstValue(params.sort) as MunicipalityListSortKey | undefined
const sort = rawSort && municipalityListSortKeySet.has(rawSort) ? rawSort : undefined
diff --git a/src/utilities/municipalityPageData.ts b/src/utilities/municipalityPageData.ts
index d74fcd6f..5c4e3194 100644
--- a/src/utilities/municipalityPageData.ts
+++ b/src/utilities/municipalityPageData.ts
@@ -126,9 +126,15 @@ const loadMunicipalityListFilterFacets = async (
/** The scope read is a PROMISE so the facets can join the page's main `Promise.all` (B16+). */
loadedScope: { where: Where; rows: Promise } | null,
): Promise => {
+ // No facet popover owns the class filter, so every facet read keeps it
+ // applied — inside the memo, so a `where` shared by two facets is filtered once.
+ const classMatches = territorialClassFilterPredicate(state)
+ const applyClassFilter = (rows: MunicipalityFacetRow[]): MunicipalityFacetRow[] =>
+ classMatches ? rows.filter((row) => classMatches(row.slug)) : rows
+
const rowsByWhere = new Map>()
if (loadedScope) {
- rowsByWhere.set(JSON.stringify(loadedScope.where), loadedScope.rows)
+ rowsByWhere.set(JSON.stringify(loadedScope.where), loadedScope.rows.then(applyClassFilter))
}
const facetRows = (omit: Partial): Promise => {
const where = buildMunicipalityListWhere({ ...state, ...omit })
@@ -147,24 +153,16 @@ const loadMunicipalityListFilterFacets = async (
user,
overrideAccess: false,
})
- .then((result) => result.docs as MunicipalityFacetRow[])
+ .then((result) => applyClassFilter(result.docs as MunicipalityFacetRow[]))
rowsByWhere.set(key, rows)
return rows
}
- // No facet popover owns the class filter, so all three keep it applied.
- const classMatches = territorialClassFilterPredicate(state)
- const withClassFilter = (rows: MunicipalityFacetRow[]): MunicipalityFacetRow[] =>
- classMatches ? rows.filter((row) => classMatches(row.slug)) : rows
-
- const [rawSlugRows, rawRegionRows, rawAdvisorRows] = await Promise.all([
+ const [slugRows, regionRows, advisorRows] = await Promise.all([
facetRows({ slugs: undefined, priority: undefined }),
facetRows({ regions: undefined }),
facetRows({ advisors: undefined, coverage: undefined }),
])
- const slugRows = withClassFilter(rawSlugRows)
- const regionRows = withClassFilter(rawRegionRows)
- const advisorRows = withClassFilter(rawAdvisorRows)
// Selected values are unioned in: a selection must stay visible to be undone.
const availableSlugs = new Set([...slugRows.map((row) => row.slug), ...(state.slugs ?? [])])
diff --git a/src/utilities/municipalityTerritorialClass.ts b/src/utilities/municipalityTerritorialClass.ts
index 5c969b75..b0632277 100644
--- a/src/utilities/municipalityTerritorialClass.ts
+++ b/src/utilities/municipalityTerritorialClass.ts
@@ -5,6 +5,7 @@ import {
type MunicipalityFederalBaseline,
} from '@/lib/bahiaElectionAggregates'
import { ELECTION_YEAR_2022 } from '@/lib/electionResults'
+import { computeVoteRankByYear } from '@/lib/municipalityVoteRank'
import { captureRate, ownVotes2022, projectedFieldCeiling } from '@/utilities/municipalityPotential'
/**
@@ -71,8 +72,6 @@ export type MunicipalityTerritorialClassification = {
lq: number | null
/** Share of his statewide vote that comes from here (the mesa's own anchor, A11). */
ownShare: number
- /** Field votes (projected 2022 ceiling) his candidacy did not capture. */
- fieldHeadroom: number
/** True when the município belongs to the block holding `coreCumulativeShare` of his vote. */
inCoreBlock: boolean
}
@@ -95,7 +94,6 @@ const UNCLASSIFIED: MunicipalityTerritorialClassification = {
factors: [],
lq: null,
ownShare: 0,
- fieldHeadroom: 0,
inCoreBlock: false,
}
@@ -114,12 +112,7 @@ export const classifyMunicipalityTerritory = (
const stateShare = stateOwnVotes / stateValidVotes
const lq = ownVotes / validVotes / stateShare
const ownShare = ownVotes / stateOwnVotes
- const shared = {
- lq,
- ownShare,
- fieldHeadroom: input.fieldHeadroom,
- inCoreBlock: input.inCoreBlock,
- }
+ const shared = { lq, ownShare, inCoreBlock: input.inCoreBlock }
const dominance: TerritorialFactor = { id: 'dominance', value: lq }
const ownShareFactor: TerritorialFactor = { id: 'ownShare', value: ownShare }
const fieldFactor: TerritorialFactor = { id: 'field', value: input.fieldHeadroom }
@@ -173,31 +166,26 @@ let catalogContext: CatalogContext | null = null
const getCatalogContext = (): CatalogContext => {
if (catalogContext) return catalogContext
- const rows = federalBaselineMunicipalitySlugs().map((slug) => {
- const baseline = getMunicipalityFederalBaseline(slug)
- return {
- slug,
- ownVotes: ownVotes2022(baseline),
- fieldHeadroom: fieldHeadroomOf(baseline),
- hasFieldData: projectedFieldCeiling(baseline) > 0,
- }
- })
-
// Slugs whose majoritarian cell is missing would drag the median to zero and
// make every weak município read as "expansão".
const medianFieldHeadroom = median(
- rows.filter((row) => row.hasFieldData).map((row) => row.fieldHeadroom),
+ federalBaselineMunicipalitySlugs()
+ .map(getMunicipalityFederalBaseline)
+ .filter((baseline) => projectedFieldCeiling(baseline) > 0)
+ .map(fieldHeadroomOf),
)
- const stateOwnVotes = getStatewideFederalTotals(TERRITORIAL_CLASS_YEAR).ownVotes
+ // A11 already ranks every slug by own vote, descending, and memoizes it —
+ // walking that map is the same order this used to re-sort for itself.
+ const coreVoteTarget =
+ getStatewideFederalTotals(TERRITORIAL_CLASS_YEAR).ownVotes *
+ TERRITORIAL_CLASS_ANCHORS.coreCumulativeShare
const coreBlockSlugs = new Set()
let accumulated = 0
- for (const row of [...rows].sort(
- (a, b) => b.ownVotes - a.ownVotes || a.slug.localeCompare(b.slug),
- )) {
- if (accumulated >= stateOwnVotes * TERRITORIAL_CLASS_ANCHORS.coreCumulativeShare) break
- coreBlockSlugs.add(row.slug)
- accumulated += row.ownVotes
+ for (const [slug, entry] of computeVoteRankByYear(TERRITORIAL_CLASS_YEAR)) {
+ if (accumulated >= coreVoteTarget) break
+ coreBlockSlugs.add(slug)
+ accumulated += entry.votes
}
catalogContext = { medianFieldHeadroom, coreBlockSlugs }
diff --git a/src/utilities/municipalityViewModels.ts b/src/utilities/municipalityViewModels.ts
index 94237b40..e8c76a1c 100644
--- a/src/utilities/municipalityViewModels.ts
+++ b/src/utilities/municipalityViewModels.ts
@@ -76,7 +76,7 @@ export type MunicipalityListViewModel = {
votePosition2022: MunicipalityVoteRankEntry | null
/** E10 — classe operacional derivada do artefato TSE. */
territorialClass: MunicipalityTerritorialClass
- /** Os dois fatores que produziram a classe: a célula nunca mostra o rótulo sozinho. */
+ /** Os fatores que produziram a classe: a célula nunca mostra o rótulo sozinho. */
territorialClassFactors: TerritorialFactor[]
/** E8 "conta da cadeira" — meta × comprometido por cenário; null fora da staff view. */
goalCoverageByScenario: Record
@@ -114,7 +114,7 @@ export const toMunicipalityListViewModel = (
pledges: pledges ?? createEmptyMunicipalityPledgeAggregate(),
votePosition2022,
territorialClass: territorialClass.class,
- territorialClassFactors: territorialClass.factors.slice(0, 2),
+ territorialClassFactors: territorialClass.factors,
goalCoverageByScenario: goalCoverageByScenario ?? createEmptyGoalCoverageByScenario(),
}
}